do not show branch graph when in filtering mode

.devcontainer/Dockerfile

@@ -1,13 +0,0 @@
-# adapted from https://github.com/devcontainers/images/blob/main/src/go/.devcontainer/Dockerfile
-
-# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.19, 1.18, 1-bullseye, 1.19-bullseye, 1.18-bullseye, 1-buster, 1.19-buster, 1.18-buster
-ARG VARIANT=1-bullseye
-FROM golang:${VARIANT}
-
-RUN go install mvdan.cc/gofumpt@latest
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.0
-RUN golangci-lint --version
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>

.devcontainer/devcontainer.json

@@ -1,69 +0,0 @@
-// adapted from https://github.com/devcontainers/images/blob/main/src/go/.devcontainer/devcontainer.json
-{
-  "build": {
-      "dockerfile": "./Dockerfile",
-      "context": "."
-  },
-  "features": {
-      "ghcr.io/devcontainers/features/common-utils:1": {
-          "installZsh": "true",
-          "username": "vscode",
-          "uid": "1000",
-          "gid": "1000",
-          "upgradePackages": "true"
-      },
-      "ghcr.io/devcontainers/features/go:1": {
-          "version": "none"
-      },
-      "ghcr.io/devcontainers/features/git:1": {
-          "version": "latest",
-          "ppa": "false"
-      }
-  },
-  "overrideFeatureInstallOrder": [
-      "ghcr.io/devcontainers/features/common-utils"
-  ],
-  // not sure if we actually need these
-  "runArgs": [
-      "--cap-add=SYS_PTRACE",
-      "--security-opt",
-      "seccomp=unconfined"
-  ],
-  // Configure tool-specific properties.
-  "customizations": {
-      // Configure properties specific to VS Code.
-      "vscode": {
-          // Set *default* container specific settings.json values on container create.
-          "settings": {
-              "go.toolsManagement.checkForUpdates": "local",
-              "go.useLanguageServer": true,
-              "go.gopath": "/go",
-              "[go]": {
-                "editor.formatOnSave": true,
-                "editor.codeActionsOnSave": {
-                  "source.organizeImports": true
-                }
-              },
-              "go.lintTool": "golangci-lint",
-              "gopls": {
-                "formatting.gofumpt": true,
-                "usePlaceholders": false // add parameter placeholders when completing a function
-              },
-              "files.eol": "\n"
-          },
-          // Add the IDs of extensions you want installed when the container is created.
-          "extensions": [
-              "golang.Go"
-          ]
-      }
-  },
-  // Use 'postCreateCommand' to run commands after the container is created.
-  // "postCreateCommand": "go version",
-
-  // See https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/ for the safe.directory part
-  // The defaultBranch part is required for our deprecated integration tests.
-  "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && git config --global init.defaultBranch master",
-
-  // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-  "remoteUser": "vscode"
-}

.editorconfig

@@ -1,4 +0,0 @@
-root = true
-
-[*.go]
-indent_style = tab

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,6 +4,7 @@ about: Create a report to help us improve
 title: ''
 labels: bug
 assignees: ''
+
 ---
 
 **Describe the bug**
@@ -11,7 +12,6 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
-
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -23,15 +23,10 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Version info:**
-_Run `lazygit --version` and paste the result here_
-_Run `git --version` and paste the result here_
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows]
+ - Lazygit Version [e.g. v0.1.45]
+ - The last commit id if you built project from sources (run : ```git-rev parse HEAD```)
 
 **Additional context**
 Add any other context about the problem here.
-
-**Note:** please try updating to the latest version or [manually building](https://github.com/jesseduffield/lazygit/#manual) the latest `master` to see if the issue still occurs.
-
-<!--
-If you want to try and debug this issue yourself, you can run `lazygit --debug` in one terminal panel and `lazygit --logs` in another to view the logs.
--->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,6 +4,7 @@ about: Suggest an idea for this project
 title: ''
 labels: enhancement
 assignees: ''
+
 ---
 
 **Is your feature request related to a problem? Please describe.**
@@ -17,13 +18,3 @@ A clear and concise description of any alternative solutions or features you've
 
 **Additional context**
 Add any other context or screenshots about the feature request here.
-
-<!--
-You may be able to add your desired feature with a custom command. Check out the examples here: https://github.com/jesseduffield/lazygit/wiki/Custom-Commands-Compendium
-
-If a custom command does what you want but you still want to see the feature built-in to lazygit, feel free to paste the custom command into the issue to help us better understand the functionality you want.
-
-We also encourage you to put up a PR yourself! Who cares if you've never written Go before, neither did any of the existing contributors before their first lazygit PR! Check out the PR tutorial here: https://www.youtube.com/watch?v=kNavnhzZHtk&ab_channel=JesseDuffield
-
-Also check out the contributing guide here: https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md
--->

.github/pull_request_template.md

@@ -1,15 +0,0 @@
-- **PR Description**
-
-- **Please check if the PR fulfills these requirements**
-
-* [ ] Cheatsheets are up-to-date (run `go generate ./...`)
-* [ ] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting))
-* [ ] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide)
-* [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation))
-* [ ] Docs have been updated if necessary
-* [ ] You've read through your own file changes for silly mistakes etc
-
-<!--
-Be sure to name your PR with an imperative e.g. 'Add worktrees view'
-see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for examples
--->

.github/release.yml

@@ -1,26 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - ignore-for-release
-  categories:
-    - title: Features ✨
-      labels:
-        - feature
-    - title: Enhancements 🔥
-      labels:
-        - enhancement
-    - title: Fixes 🔧
-      labels:
-        - bug
-    - title: Maintenance ⚙️
-      labels:
-        - maintenance
-    - title: Docs 📖
-      labels:
-        - docs
-    - title: I18n 🌎
-      labels:
-        - i18n
-    - title: Other Changes
-      labels:
-        - "*"

.github/workflows/automerge.yml

@@ -0,0 +1,28 @@
+name: automerge
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: rebase

.github/workflows/cd.yml

@@ -3,30 +3,26 @@ name: Continuous Delivery
 on:
   push:
     tags:
-      - "v*"
+      - 'v*'
 
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: Unshallow repo
         run: git fetch --prune --unshallow
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
         with:
-          go-version: 1.22.x
+          go-version: 1.16.x
       - name: Run goreleaser
-        uses: goreleaser/goreleaser-action@v4
-        with:
-          distribution: goreleaser
-          version: v1.17.2
-          args: release --clean
+        uses: goreleaser/goreleaser-action@v1
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_API_TOKEN}}
   homebrew:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - name: Bump Homebrew formula
         uses: dawidd6/action-homebrew-bump-formula@v3

.github/workflows/ci.yml

@@ -1,8 +1,5 @@
 name: Continuous Integration
 
-env:
-  GO_VERSION: 1.22
-
 on:
   push:
     branches:
@@ -10,100 +7,34 @@ on:
   pull_request:
 
 jobs:
-  unit-tests:
+  ci:
     strategy:
       fail-fast: false
       matrix:
         os:
           - ubuntu-latest
           - windows-latest
-        include:
-          - os: ubuntu-latest
-            cache_path: ~/.cache/go-build
-          - os: windows-latest
-            cache_path: ~\AppData\Local\go-build
     name: ci - ${{matrix.os}}
     runs-on: ${{matrix.os}}
     env:
       GOFLAGS: -mod=vendor
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
         with:
-          go-version: 1.22.x
+          go-version: 1.16.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/go-build
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-test
+          restore-keys: |
+            ${{runner.os}}-go-
       - name: Test code
-        # we're passing -short so that we skip the integration tests, which will be run in parallel below
         run: |
-          mkdir -p /tmp/code_coverage
-          go test ./... -short -cover -args "-test.gocoverdir=/tmp/code_coverage"
-      - name: Upload code coverage artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: coverage-unit-${{ matrix.os }}-${{ github.run_id }}
-          path: /tmp/code_coverage
-
-  integration-tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        git-version:
-          - 2.20.0 # oldest supported version
-          - 2.22.5
-          - 2.23.0
-          - 2.25.1
-          - 2.30.8
-          - latest # We rely on github to have the latest version installed on their VMs
-    runs-on: ubuntu-latest
-    name: "Integration Tests - git ${{matrix.git-version}}"
-    env:
-      GOFLAGS: -mod=vendor
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Restore Git cache
-        if: matrix.git-version != 'latest'
-        id: cache-git-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: ~/git-${{matrix.git-version}}
-          key: ${{runner.os}}-git-${{matrix.git-version}}
-      - name: Build Git ${{matrix.git-version}}
-        if: steps.cache-git-restore.outputs.cache-hit != 'true' && matrix.git-version != 'latest'
-        run: >
-          sudo apt-get update && sudo apt-get install --no-install-recommends -y build-essential ca-certificates curl gettext libexpat1-dev libssl-dev libz-dev openssl
-          && curl -sL "https://mirrors.edge.kernel.org/pub/software/scm/git/git-${{matrix.git-version}}.tar.xz" -o - | tar xJ -C "$HOME"
-          && cd "$HOME/git-${{matrix.git-version}}"
-          && ./configure
-          && make -j
-      - name: Install Git ${{matrix.git-version}}
-        if: matrix.git-version != 'latest'
-        run: sudo make -C "$HOME/git-${{matrix.git-version}}" -j install
-      - name: Save Git cache
-        if: steps.cache-git-restore.outputs.cache-hit != 'true' && matrix.git-version != 'latest'
-        uses: actions/cache/save@v3
-        with:
-          path: ~/git-${{matrix.git-version}}
-          key: ${{runner.os}}-git-${{matrix.git-version}}
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.22.x
-      - name: Print git version
-        run: git --version
-      - name: Test code
-        env:
-          # See https://go.dev/blog/integration-test-coverage
-          LAZYGIT_GOCOVERDIR: /tmp/code_coverage
-        run: |
-          mkdir -p /tmp/code_coverage
-          ./scripts/run_integration_tests.sh
-      - name: Upload code coverage artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: coverage-integration-${{ matrix.git-version }}-${{ github.run_id }}
-          path: /tmp/code_coverage
+          bash ./test.sh
   build:
     runs-on: ubuntu-latest
     env:
@@ -111,11 +42,18 @@ jobs:
       GOARCH: amd64
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
         with:
-          go-version: 1.22.x
+          go-version: 1.16.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/go-build
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-build
+          restore-keys: |
+            ${{runner.os}}-go-
       - name: Build linux binary
         run: |
           GOOS=linux go build
@@ -125,97 +63,43 @@ jobs:
       - name: Build darwin binary
         run: |
           GOOS=darwin go build
-      - name: Build integration test binary
-        run: |
-          GOOS=linux go build cmd/integration_test/main.go
-      - name: Build integration test injector
-        run: |
-          GOOS=linux go build pkg/integration/clients/injector/main.go
-  check-codebase:
+  check-cheatsheet:
     runs-on: ubuntu-latest
     env:
       GOFLAGS: -mod=vendor
       GOARCH: amd64
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
         with:
-          go-version: 1.22.x
-      - name: Check Vendor Directory
-        # ensure our vendor directory matches up with our go modules
+          go-version: 1.16.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/go-build
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-build
+          restore-keys: |
+            ${{runner.os}}-go-
+      - name: Check Cheatsheet
         run: |
-          go mod vendor && git diff --exit-code || (echo "Unexpected change to vendor directory. Run 'go mod vendor' locally and commit the changes" && exit 1)
-      - name: Check go.mod file
-        # ensure our go.mod file is clean
-        run: |
-          go mod tidy && git diff --exit-code || (echo "go.mod file is not clean. Run 'go mod tidy' locally and commit the changes" && exit 1)
-      - name: Check All Auto-Generated Files
-        # ensure all our auto-generated files are up to date
-        run: |
-          go generate ./... && git diff --quiet || (git status -s; echo "Auto-generated files not up to date. Run 'go generate ./...' locally and commit the changes" && exit 1)
-        shell: bash # needed so that we get "-o pipefail"
-      - name: Check Filenames
-        run: scripts/check_filenames.sh
+          go run scripts/cheatsheet/main.go check
   lint:
     runs-on: ubuntu-latest
-    env:
-      GOFLAGS: -mod=vendor
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.22.x
+      - name: Checkout
+        uses: actions/checkout@v2
       - name: Lint
-        uses: golangci/golangci-lint-action@v3.7.0
+        uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.58
+          version: latest
+      - name: Format code
+        run: |
+          if [ $(find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;|wc -l) -gt 0 ]; then
+           find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;
+           exit 1
+          fi
       - name: errors
         run: golangci-lint run
         if: ${{ failure() }}
-  check-required-label:
-    runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/master'
-    steps:
-      - uses: mheap/github-action-required-labels@v5
-        with:
-          mode: exactly
-          count: 1
-          labels: "ignore-for-release, feature, enhancement, bug, maintenance, docs, i18n"
-  upload-coverage:
-    # List all jobs that produce coverage files
-    needs: [unit-tests, integration-tests]
-    if: github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.22.x
-
-      - name: Download all coverage artifacts
-        uses: actions/download-artifact@v3
-        with:
-          path: /tmp/code_coverage
-
-      - name: Combine coverage files
-        run: |
-          # Find all directories in /tmp/code_coverage and create a comma-separated list
-          COVERAGE_DIRS=$(find /tmp/code_coverage -mindepth 1 -maxdepth 1 -type d -printf '/tmp/code_coverage/%f,' | sed 's/,$//')
-          echo "Coverage directories: $COVERAGE_DIRS"
-          # Run the combine command with the generated list
-          go tool covdata textfmt -i=$COVERAGE_DIRS -o coverage.out
-          echo "Combined coverage:"
-          go tool cover -func coverage.out | tail -1 | awk '{print $3}'
-
-      - name: Upload to Codacy
-        run: |
-          CODACY_PROJECT_TOKEN=${{ secrets.CODACY_PROJECT_TOKEN }} \
-            bash <(curl -Ls https://coverage.codacy.com/get.sh) report \
-            --force-coverage-parser go -r coverage.out

.github/workflows/sponsors.yml

@@ -1,28 +0,0 @@
-# see https://github.com/JamesIves/github-sponsors-readme-action
-name: Generate Sponsors README
-on:
-  push:
-    branches:
-      - master
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout 🛎️
-        uses: actions/checkout@v3
-
-      - name: Generate Sponsors 💖
-        uses: JamesIves/github-sponsors-readme-action@v1.2.2
-        with:
-          token: ${{ secrets.SPONSORS_TOKEN }}
-          file: "README.md"
-        if: ${{ github.repository == 'jesseduffield/lazygit' }}
-
-      - name: Create Pull Request 🚀
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: "README.md: Update Sponsors"
-          title: "README.md: Update Sponsors"
-          author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
-          labels: "ignore-for-release"
-          delete-branch: true

.gitignore

@@ -6,6 +6,9 @@
 # Hidden
 .*
 
+# TODO
+TODO.*
+
 # Notes
 *.notes
 
@@ -15,29 +18,19 @@ coverage.txt
 
 # Binaries
 lazygit
-lazygit.exe
 
 # Exceptions
 !.gitignore
 !.goreleaser.yml
-!.golangci.yml
 !.circleci/
 !.github/
-!.vscode/
-!.devcontainer/
-
-# these are for our integration tests
-!.git_keep
-!.gitmodules_keep
 
 test/git_server/data
-
-test/_results/**
-
-oryxBuildBinary
-__debug_bin
-
-.worktrees
-demo/output/*
-
-coverage.out
+test/integration/*/actual/
+test/integration/*/actual_remote/
+test/integration/*/used_config/
+# these sample hooks waste too much space
+test/integration/*/expected/.git_keep/hooks/
+test/integration/*/expected_remote/hooks/
+!.git_keep/
+lazygit.exe

.golangci.yml

@@ -1,39 +0,0 @@
-linters:
-  disable:
-    - structcheck # gives false positives
-  enable:
-    - gofumpt
-    - thelper
-    - goimports
-    - tparallel
-    - wastedassign
-    - exportloopref
-    - unparam
-    - prealloc
-    - unconvert
-    - exhaustive
-    - makezero
-    - nakedret
-    - copyloopvar
-  fast: false
-
-linters-settings:
-  copyloopvar:
-    # Check all assigning the loop variable to another variable.
-    # Default: false
-    # If true, an assignment like `a := x` will be detected as an error.
-    check-alias: true
-  exhaustive:
-    default-signifies-exhaustive: true
-  staticcheck:
-    # SA1019 is for checking that we're not using fields marked as deprecated
-    # in a comment. It decides this in a loose way so I'm silencing it. Also because
-    # it's tripping on our own structs.
-    checks: ["all", "-SA1019"]
-  nakedret:
-    # the gods will judge me but I just don't like naked returns at all
-    max-func-lines: 0
-
-run:
-  go: '1.22'
-  timeout: 10m

.goreleaser.yml

@@ -12,7 +12,7 @@ builds:
       - amd64
       - arm
       - arm64
-      - '386'
+      - 386
     # Default is `-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}`.
     ldflags:
       - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.buildSource=binaryRelease
@@ -32,8 +32,12 @@ checksum:
 snapshot:
   name_template: '{{ .Tag }}-next'
 changelog:
-  use: github-native
   sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
+      - '^bump'
 brews:
   -
     # Repository to push the tap to.

.vscode/debugger_config.yml

@@ -1 +0,0 @@
-disableStartupPopups: true

.vscode/launch.json

@@ -1,61 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Debug Lazygit",
-      "type": "go",
-      "request": "launch",
-      "mode": "auto",
-      "program": "main.go",
-      "args": [
-        "--debug",
-        "--use-config-file=${workspaceFolder}/.vscode/debugger_config.yml"
-      ],
-      "hideSystemGoroutines": true,
-      "console": "integratedTerminal",
-    },
-    {
-      "name": "Tail Lazygit logs",
-      "type": "go",
-      "request": "launch",
-      "mode": "auto",
-      "program": "main.go",
-      "args": [
-        "--logs",
-        "--use-config-file=${workspaceFolder}/.vscode/debugger_config.yml"
-      ],
-      "console": "integratedTerminal",
-    },
-    {
-      "name": "Attach to a running Lazygit",
-      "type": "go",
-      "request": "attach",
-      "mode": "local",
-      "processId": "lazygit",
-      "hideSystemGoroutines": true,
-      "console": "integratedTerminal",
-    },
-    {
-      // To use this, first start an integration test with the "cli" runner and
-      // use the -debug option; e.g.
-      // $ make integration-test-cli -- -debug tag/reset.go
-      "name": "Attach to integration test runner",
-      "type": "go",
-      "request": "attach",
-      "mode": "local",
-      "processId": "test_lazygit",
-      "hideSystemGoroutines": true,
-      "console": "integratedTerminal",
-    },
-  ],
-  "compounds": [
-    {
-      "name": "Run with logs",
-      "configurations": [
-        "Tail Lazygit logs",
-        "Debug Lazygit"
-      ],
-      "stopAll": true
-    }
-  ]
-}

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-  "gopls": {
-    "formatting.gofumpt": true,
-  },
-}

.vscode/tasks.json

@@ -1,86 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "Generate cheatsheet",
-      "type": "shell",
-      "command": "go run scripts/cheatsheet/main.go generate",
-      "problemMatcher": [],
-    },
-    {
-      "label": "Bump gocui",
-      "type": "shell",
-      "command": "./scripts/bump_gocui.sh",
-      "problemMatcher": [],
-    },
-    {
-      "label": "Bump lazycore",
-      "type": "shell",
-      "command": "./scripts/bump_lazycore.sh",
-      "problemMatcher": [],
-    },
-    {
-      "label": "Run current file integration test",
-      "type": "shell",
-      "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli ${relativeFile}",
-      "problemMatcher": [],
-      "group": {
-        "kind": "test",
-        "isDefault": true
-      },
-      "presentation": {
-        "focus": true
-      }
-    },
-    {
-      "label": "Run current file integration test (slow)",
-      "type": "shell",
-      "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli --slow ${relativeFile}",
-      "problemMatcher": [],
-      "group": {
-        "kind": "test",
-      },
-      "presentation": {
-        "focus": true
-      }
-    },
-    {
-      "label": "Run current file integration test (sandbox)",
-      "type": "shell",
-      "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli --sandbox ${relativeFile}",
-      "problemMatcher": [],
-      "group": {
-        "kind": "test",
-      },
-      "presentation": {
-        "focus": true
-      }
-    },
-    {
-      "label": "Open deprecated test TUI",
-      "type": "shell",
-      "command": "go run pkg/integration/deprecated/cmd/tui/main.go",
-      "problemMatcher": [],
-      "group": {
-        "kind": "test",
-      },
-      "presentation": {
-        "focus": true
-      }
-    },
-    {
-      "label": "Sync tests list",
-      "type": "shell",
-      "command": "go generate pkg/integration/tests/tests.go",
-      "problemMatcher": [],
-      "group": {
-        "kind": "test",
-      },
-      "presentation": {
-        "focus": true
-      }
-    },
-  ],
-}

CODE-OF-CONDUCT.md

@@ -1,3 +1,74 @@
-# Lazygit Code of Conduct
+# Contributor Covenant Code of Conduct
 
-Be nice, or face the wrath of the maintainer.
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the [project leader](https://github.com/jesseduffield). 
+All complaints will be reviewed and investigated and will result in a response that
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

@@ -6,20 +6,7 @@ When contributing to this repository, please first discuss the change you wish
 to make via issue, email, or any other method with the owners of this repository
 before making a change.
 
-## PR walkthrough
-
-[This video](https://www.youtube.com/watch?v=kNavnhzZHtk) walks through the process of adding a small feature to lazygit. If you have no idea where to start, watching that video is a good first step.
-
-## Codebase guide
-
-[This doc](./docs/dev/Codebase_Guide.md) explains:
-* what the different packages in the codebase are for
-* where important files live
-* important concepts in the code
-* how the event loop works
-* other useful information
-
-## All code changes happen through Pull Requests
+## So all code changes happen through Pull Requests
 
 Pull requests are the best way to propose changes to the codebase. We actively
 welcome your pull requests:
@@ -27,34 +14,10 @@ welcome your pull requests:
 1. Fork the repo and create your branch from `master`.
 2. If you've added code that should be tested, add tests.
 3. If you've added code that need documentation, update the documentation.
-4. Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-5. Issue that pull request!
-
-Please do not raise pull request from your fork's master branch: make a feature branch instead. Lazygit maintainers will sometimes push changes to your branch when reviewing a PR and we often can't do this if you use your master branch.
-
-If you've never written Go in your life, then join the club! Lazygit was the maintainer's first Go program, and most contributors have never used Go before. Go is widely considered an easy-to-learn language, so if you're looking for an open source project to gain dev experience, you've come to the right place.
-
-## Running in a VSCode dev container
-
-If you want to spare yourself the hassle of setting up your dev environment yourself (i.e. installing Go, extensions, and extra tools), you can run the Lazygit code in a VSCode dev container like so:
-
-![image](https://user-images.githubusercontent.com/8456633/201500508-0d55f99f-5035-4a6f-a0f8-eaea5c003e5d.png)
-
-This requires that:
-* you have docker installed
-* you have the dev containers extension installed in VSCode
-
-See [here](https://code.visualstudio.com/docs/devcontainers/containers) for more info about dev containers.
-
-## Running in a Github Codespace
-
-If you want to start contributing to Lazygit with the click of a button, you can open the lazygit codebase in a Codespace. First fork the repo, then click to create a codespace:
-
-![image](https://user-images.githubusercontent.com/8456633/201500566-ffe9105d-6030-4cc7-a525-6570b0b413a2.png)
-
-To run lazygit from within the integrated terminal just go `go run main.go`
-
-This allows you to contribute to Lazygit without needing to install anything on your local machine. The Codespace has all the necessary tools and extensions pre-installed.
+4. Make sure your code follows the [effective go](https://golang.org/doc/effective_go.html) guidelines as much as possible.
+5. Be sure to test your modifications.
+6. Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+7. Issue that pull request!
 
 ## Code of conduct
 
@@ -73,98 +36,11 @@ covers the project. Feel free to contact the maintainers if that's a concern.
 We use GitHub issues to track public bugs. Report a bug by [opening a new
 issue](https://github.com/jesseduffield/lazygit/issues/new); it's that easy!
 
-## Go
-
-This project is written in Go. Go is an opinionated language with strict idioms, but some of those idioms are a little extreme. Some things we do differently:
-
-1. There is no shame in using `self` as a receiver name in a struct method. In fact we encourage it
-2. There is no shame in prefixing an interface with 'I' instead of suffixing with 'er' when there are several methods on the interface.
-3. If a struct implements an interface, we make it explicit with something like:
-
-```go
-var _ MyInterface = &MyStruct{}
-```
-
-This makes the intent clearer and means that if we fail to satisfy the interface we'll get an error in the file that needs fixing.
-
-### Code Formatting
-
-To check code formatting [gofumpt](https://pkg.go.dev/mvdan.cc/gofumpt#section-readme) (which is a bit stricter than [gofmt](https://pkg.go.dev/cmd/gofmt)) is used.
-VSCode will format the code correctly if you tell the Go extension to use `gofumpt` via your [`settings.json`](https://code.visualstudio.com/docs/getstarted/settings#_settingsjson)
-by setting [`formatting.gofumpt`](https://github.com/golang/tools/blob/master/gopls/doc/settings.md#gofumpt-bool) to `true`:
-
-```jsonc
-// .vscode/settings.json
-{
-  "gopls": {
-    "formatting.gofumpt": true
-  }
-}
-```
-
-To run gofumpt from your terminal go:
-
-```
-go install mvdan.cc/gofumpt@latest && gofumpt -l -w .
-```
-
-## Programming Font
-
-Lazygit supports [Nerd Fonts](https://www.nerdfonts.com) to render certain icons. Sometimes we use some of these icons verbatim in string literals in the code (mainly in tests), so you need to set your development environment to use a nerd font to see these.
-
-## Internationalisation
-
-Boy that's a hard word to spell. Anyway, lazygit is translated into several languages within the pkg/i18n package. If you need to render text to the user, you should add a new field to the TranslationSet struct in `pkg/i18n/english.go` and add the actual content within the `EnglishTranslationSet()` method in the same file. Then you can access via `gui.Tr.YourNewText` (or `self.c.Tr.YourNewText`, etc). Although it is appreciated if you translate the text into other languages, it's not expected of you (google translate will likely do a bad job anyway!).
-
-Note, we use 'Sentence case' for everything (so no 'Title Case' or 'whatever-it's-called-when-there's-no-capital-letters-case')
-
-## Debugging
-
-The easiest way to debug lazygit is to have two terminal tabs open at once: one for running lazygit (via `go run main.go -debug` in the project root) and one for viewing lazygit's logs (which can be done via `go run main.go --logs` or just `lazygit --logs`).
-
-From most places in the codebase you have access to a logger e.g. `gui.Log.Warn("blah")` or `self.c.Log.Warn("blah")`.
-
-If you find that the existing logs are too noisy, you can set the log level with e.g. `LOG_LEVEL=warn go run main.go -debug` and then only use `Warn` logs yourself.
-
-If you need to log from code in the vendor directory (e.g. the `gocui` package), you won't have access to the logger, but you can easily add logging support by setting the `LAZYGIT_LOG_PATH` environment variable and using `logs.Global.Warn("blah")`. This is a global logger that's only intended for development purposes.
-
-If you keep having to do some setup steps to reproduce an issue, read the Testing section below to see how to create an integration test by recording a lazygit session. It's pretty easy!
-
-### VSCode debugger
-
-If you want to trigger a debug session from VSCode, you can use the following snippet. Note that the `console` key is, at the time of writing, still an experimental feature.
-
-```jsonc
-// .vscode/launch.json
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "debug lazygit",
-      "type": "go",
-      "request": "launch",
-      "mode": "auto",
-      "program": "main.go",
-      "args": ["--debug"],
-      "console": "externalTerminal" // <-- you need this to actually see the lazygit UI in a window while debugging
-    }
-  ]
-}
-```
-
-## Profiling
-
-If you want to investigate what's contributing to CPU or memory usage, see [this separate document](docs/dev/Profiling.md).
-
-## Testing
-
-Lazygit has two kinds of tests: unit tests and integration tests. Unit tests go in files that end in `_test.go`, and are written in Go. For integration tests, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md)
-
 ## Updating Gocui
 
-Sometimes you will need to make a change in the gocui fork (https://github.com/jesseduffield/gocui). Gocui is the package responsible for rendering windows and handling user input. Here's the typical process to follow:
+Sometimes you will need to make a change in the gocui fork (https://github.com/jesseduffield/gocui). Gocui is the package responsible for rending windows and handling user input. Here's the typical process to follow:
 
-1. Make the changes in gocui inside lazygit's vendor directory so it's easy to test against lazygit
+1. Make the changes in gocui inside the vendor directory so it's easy to test against lazygit
 2. Copy the changes over to the actual gocui repo (clone it if you haven't already, and use the `awesome` branch, not `master`)
 3. Raise a PR on the gocui repo with your changes
 4. After that PR is merged, make a PR in lazygit bumping the gocui version. You can bump the version by running the following at the lazygit repo root:
@@ -174,24 +50,3 @@ Sometimes you will need to make a change in the gocui fork (https://github.com/j
 ```
 
 5. Raise a PR in lazygit with those changes
-
-## Updating Lazycore
-
-[Lazycore](https://github.com/jesseduffield/lazycore) is a repo containing shared functionality between lazygit and lazydocker. Sometimes you will need to make a change to that repo and import the changes into lazygit. Similar to updating Gocui, here's what you do:
-
-1. Make the changes in lazycore inside lazygit's vendor directory so it's easy to test against lazygit
-2. Copy the changes over to the actual lazycore repo (clone it if you haven't already, and use the `master` branch)
-3. Raise a PR on the lazycore repo with your changes
-4. After that PR is merged, make a PR in lazygit bumping the lazycore version. You can bump the version by running the following at the lazygit repo root:
-
-```sh
-./scripts/bump_lazycore.sh
-```
-
-Or if you're using VSCode, there is a bump lazycore task you can find by going `cmd+shift+p` and typing 'Run task'
-
-5. Raise a PR in lazygit with those changes
-
-## Improvements
-
-If you can think of any way to improve these docs let us know.

Dockerfile

@@ -2,18 +2,16 @@
 # docker build -t lazygit .
 # docker run -it lazygit:latest /bin/sh
 
-FROM golang:1.22 as build
+FROM golang:1.14-alpine3.11
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
-COPY go.mod go.sum ./
-RUN go mod download
-COPY . .
+COPY ./ .
 RUN CGO_ENABLED=0 GOOS=linux go build
 
-FROM alpine:3.15
-RUN apk add --no-cache -U git xdg-utils
+FROM alpine:3.11
+RUN apk add -U git xdg-utils
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
-COPY --from=build /go/src/github.com/jesseduffield/lazygit ./
-COPY --from=build /go/src/github.com/jesseduffield/lazygit/lazygit /bin/
+COPY --from=0 /go/src/github.com/jesseduffield/lazygit /go/src/github.com/jesseduffield/lazygit
+COPY --from=0 /go/src/github.com/jesseduffield/lazygit/lazygit /bin/
 RUN echo "alias gg=lazygit" >> ~/.profile
 
 ENTRYPOINT [ "lazygit" ]

Makefile

@@ -1,72 +0,0 @@
-.PHONY: all
-all: build
-
-.PHONY: build
-build:
-	go build -gcflags='all=-N -l'
-
-.PHONY: install
-install:
-	go install
-
-.PHONY: run
-run: build
-	./lazygit
-
-# Run `make run-debug` in one terminal tab and `make print-log` in another to view the program and its log output side by side
-.PHONY: run-debug
-run-debug:
-	go run main.go -debug
-
-.PHONY: print-log
-print-log:
-	go run main.go --logs
-
-.PHONY: unit-test
-unit-test:
-	go test ./... -short
-
-.PHONY: test
-test: unit-test integration-test-all
-
-# Generate all our auto-generated files (test list, cheatsheets, maybe other things in the future)
-.PHONY: generate
-generate:
-	go generate ./...
-
-.PHONY: format
-format:
-	gofumpt -l -w .
-
-.PHONY: lint
-lint:
-	golangci-lint run
-
-# For more details about integration test, see https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md.
-.PHONY: integration-test-tui
-integration-test-tui:
-	go run cmd/integration_test/main.go tui $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: integration-test-cli
-integration-test-cli:
-	go run cmd/integration_test/main.go cli $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: integration-test-all
-integration-test-all:
-	go test pkg/integration/clients/*.go
-
-.PHONY: bump-gocui
-bump-gocui:
-	scripts/bump_gocui.sh
-
-.PHONY: bump-lazycore
-bump-lazycore:
-	scripts/bump_lazycore.sh
-
-.PHONY: record-demo
-record-demo:
-	demo/record_demo.sh $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: vendor
-vendor:
-	go mod vendor && go mod tidy

cmd/integration_test/main.go

@@ -1,84 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-
-	"github.com/jesseduffield/lazygit/pkg/integration/clients"
-)
-
-var usage = `
-Usage:
-	See https://github.com/jesseduffield/lazygit/tree/master/pkg/integration/README.md
-
-	CLI mode:
-		> go run cmd/integration_test/main.go cli [--slow] [--sandbox] <test1> <test2> ...
-	If you pass no test names, it runs all tests
-	Accepted environment variables:
-	INPUT_DELAY (e.g. 200): the number of milliseconds to wait between keypresses or mouse clicks
-
-	TUI mode:
-		> go run cmd/integration_test/main.go tui
-	This will open up a terminal UI where you can run tests
-
-	Help:
-		> go run cmd/integration_test/main.go help
-`
-
-type flagInfo struct {
-	name string // name of the flag; can be used with "-" or "--"
-	flag *bool  // a pointer to the variable that should be set to true when this flag is passed
-}
-
-// Takes the args that you want to parse (excluding the program name and any
-// subcommands), and returns the remaining args with the flags removed
-func parseFlags(args []string, flags []flagInfo) []string {
-outer:
-	for len(args) > 0 {
-		for _, f := range flags {
-			if args[0] == "-"+f.name || args[0] == "--"+f.name {
-				*f.flag = true
-				args = args[1:]
-				continue outer
-			}
-		}
-		break
-	}
-
-	return args
-}
-
-func main() {
-	if len(os.Args) < 2 {
-		log.Fatal(usage)
-	}
-
-	switch os.Args[1] {
-	case "help":
-		fmt.Println(usage)
-	case "cli":
-		slow := false
-		sandbox := false
-		waitForDebugger := false
-		raceDetector := false
-		testNames := parseFlags(os.Args[2:], []flagInfo{
-			{"slow", &slow},
-			{"sandbox", &sandbox},
-			{"debug", &waitForDebugger},
-			{"race", &raceDetector},
-		})
-		clients.RunCLI(testNames, slow, sandbox, waitForDebugger, raceDetector)
-	case "tui":
-		raceDetector := false
-		remainingArgs := parseFlags(os.Args[2:], []flagInfo{
-			{"race", &raceDetector},
-		})
-		if len(remainingArgs) > 0 {
-			log.Fatal("tui only supports the -race argument.")
-		}
-		clients.RunTUI(raceDetector)
-	default:
-		log.Fatal(usage)
-	}
-}

demo/README.md

@@ -1,2 +0,0 @@
-This directory contains stuff for recording lazygit demos.
-

demo/config.yml

@@ -1,112 +0,0 @@
-# Specify a command to be executed
-# like `/bin/bash -l`, `ls`, or any other commands
-# the default is bash for Linux
-# or powershell.exe for Windows
-command: echo "YOU NEED TO SPECIFY YOUR OWN COMMAND WITH THE -d ARG"
-
-# Specify the current working directory path
-# the default is the current working directory path
-cwd: null
-
-# Export additional ENV variables
-env:
-  recording: true
-
-# Explicitly set the number of columns
-# or use `auto` to take the current
-# number of columns of your shell
-cols: 120 # 100
-
-# Explicitly set the number of rows
-# or use `auto` to take the current
-# number of rows of your shell
-rows: 35 # 30
-
-# Amount of times to repeat GIF
-# If value is -1, play once
-# If value is 0, loop indefinitely
-# If value is a positive number, loop n times
-repeat: 0
-
-# Quality
-# 1 - 100
-# Higher quality seems to make no difference, but running it through
-# gifsicle ends up with a much better compressed version.
-quality: 100
-
-# Delay between frames in ms
-# If the value is `auto` use the actual recording delays
-frameDelay: auto
-
-# Maximum delay between frames in ms
-# Ignored if the `frameDelay` isn't set to `auto`
-# Set to `auto` to prevent limiting the max idle time
-maxIdleTime: 2000
-
-# The surrounding frame box
-# The `type` can be null, window, floating, or solid`
-# To hide the title use the value null
-# Don't forget to add a backgroundColor style with a null as type
-frameBox:
-  type: floating
-  title: Lazygit
-  style:
-    border: 0px black solid
-    backgroundColor: "#1d1d1d"
-    margin: -5px
-
-# Add a watermark image to the rendered gif
-# You need to specify an absolute path for
-# the image on your machine or a URL, and you can also
-# add your own CSS styles
-watermark:
-  imagePath: null
-  style:
-    position: absolute
-    right: 15px
-    bottom: 15px
-    width: 100px
-    opacity: 0.9
-
-# Cursor style can be one of
-# `block`, `underline`, or `bar`
-cursorStyle: block
-
-# Font family
-# You can use any font that is installed on your machine
-# in CSS-like syntax
-# Download from:
-# https://github.com/ryanoasis/nerd-fonts/releases/download/v3.0.2/DejaVuSansMono.zip
-# Not using the mono font because it makes icons too small.
-fontFamily: "DejaVuSansM Nerd Font"
-
-# The size of the font
-fontSize: 8
-
-# The height of lines
-lineHeight: 1
-
-# The spacing between letters
-letterSpacing: 0
-
-# Theme
-theme:
-  background: "transparent"
-  foreground: "#dddad6"
-  cursor: "#c7c7c7"
-  black: "#7a7a7a"
-  red: "#fc4384"
-  green: "#b3e33b"
-  yellow: "#ffa727"
-  blue: "#102895"
-  magenta: "#c930c7"
-  cyan: "#00c5c7"
-  white: "#c7c7c7"
-  brightBlack: "#676767"
-  brightRed: "#ff7fac"
-  brightGreen: "#c8ed71"
-  brightYellow: "#ebdf86"
-  brightBlue: "#6871ff"
-  brightMagenta: "#ff76ff"
-  brightCyan: "#5ffdff"
-  brightWhite: "#fffefe"

demo/record_demo.sh

@@ -1,81 +0,0 @@
-#!/bin/sh
-
-set -e
-
-TYPE=$1
-TEST=$2
-
-usage() {
-    echo "Usage: $0 [gif|mp4] <test path>"
-    echo "e.g. using full path: $0 gif pkg/integration/tests/demo/nuke_working_tree.go"
-    exit 1
-}
-
-if [ "$#" -ne 2 ]
-then
-    usage
-fi
-
-if [ "$TYPE" != "gif" ] && [ "$TYPE" != "mp4" ]
-then
-    usage
-    exit 1
-fi
-
-if [ -z "$TEST" ]
-then
-    usage
-fi
-
-WORKTREE_PATH=$(git worktree list | grep assets | awk '{print $1}')
-
-if [ -z "$WORKTREE_PATH" ]
-then
-    echo "Could not find assets worktree. You'll need to create a worktree for the assets branch using the following command:"
-    echo "git worktree add .worktrees/assets assets"
-    echo "The assets branch has no shared history with the main branch: it exists to store assets which are too large to store in the main branch."
-    exit 1
-fi
-
-OUTPUT_DIR="$WORKTREE_PATH/demo"
-
-if ! command -v terminalizer &> /dev/null
-then
-    echo "terminalizer could not be found"
-    echo "Install it with: npm install -g terminalizer"
-    exit 1
-fi
-
-if ! command -v "gifsicle" &> /dev/null
-then
-    echo "gifsicle could not be found"
-    echo "Install it with: npm install -g gifsicle"
-    exit 1
-fi
-
-# Get last part of the test path and set that as the output name
-# example test path: pkg/integration/tests/01_basic_test.go
-# For that we want: NAME=01_basic_test
-NAME=$(echo "$TEST" | sed -e 's/.*\///' | sed -e 's/\..*//')
-
-# Add the demo to the tests list (if missing) so that it can be run
-go generate pkg/integration/tests/tests.go
-
-mkdir -p "$OUTPUT_DIR"
-
-# First we record the demo into a yaml representation
-terminalizer -c demo/config.yml record --skip-sharing -d "go run cmd/integration_test/main.go cli --slow $TEST" "$OUTPUT_DIR/$NAME"
-# Then we render it into a gif
-terminalizer render "$OUTPUT_DIR/$NAME" -o "$OUTPUT_DIR/$NAME.gif"
-
-# Then we convert it to either an mp4 or gif based on the command line argument
-if [ "$TYPE" = "mp4" ]
-then
-    COMPRESSED_PATH="$OUTPUT_DIR/$NAME.mp4"
-    ffmpeg -y -i "$OUTPUT_DIR/$NAME.gif" -movflags faststart -pix_fmt yuv420p -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" "$COMPRESSED_PATH"
-else
-    COMPRESSED_PATH="$OUTPUT_DIR/$NAME-compressed.gif"
-    gifsicle --colors 256 --use-col=web -O3 < "$OUTPUT_DIR/$NAME.gif" > "$COMPRESSED_PATH"
-fi
-
-echo "Demo recorded to $COMPRESSED_PATH"

docs/Custom_Command_Keybindings.md

@@ -5,22 +5,20 @@ You can add custom command keybindings in your config.yml (accessible by pressin
 ```yml
 customCommands:
   - key: '<c-r>'
+    command: 'hub browse -- "commit/{{.SelectedLocalCommit.Sha}}"'
     context: 'commits'
-    command: 'hub browse -- "commit/{{.SelectedLocalCommit.Hash}}"'
   - key: 'a'
+    command: "git {{if .SelectedFile.HasUnstagedChanges}} add {{else}} reset {{end}} {{.SelectedFile.Name}}"
     context: 'files'
-    command: "git {{if .SelectedFile.HasUnstagedChanges}} add {{else}} reset {{end}} {{.SelectedFile.Name | quote}}"
-    description: 'Toggle file staged'
+    description: 'toggle file staged'
   - key: 'C'
-    context: 'global'
     command: "git commit"
+    context: 'global'
     subprocess: true
   - key: 'n'
-    context: 'localBranches'
     prompts:
       - type: 'menu'
         title: 'What kind of branch is it?'
-        key: 'BranchType'
         options:
           - name: 'feature'
             description: 'a feature branch'
@@ -33,289 +31,138 @@ customCommands:
             value: 'release'
       - type: 'input'
         title: 'What is the new branch name?'
-        key: 'BranchName'
         initialValue: ''
-    command: "git flow {{.Form.BranchType}} start {{.Form.BranchName}}"
-    loadingText: 'Creating branch'
+    command: "git flow {{index .PromptResponses 0}} start {{index .PromptResponses 1}}"
+    context: 'localBranches'
+    loadingText: 'creating branch'
+  - key : 'r'
+    description: 'Checkout a remote branch as FETCH_HEAD'
+    command: "git fetch {{index .PromptResponses 0}} {{index .PromptResponses 1}} && git checkout FETCH_HEAD"
+    context: 'remotes'
+    prompts:
+      - type: 'input'
+        title: 'Remote:'
+        initialValue: "{{index .SelectedRemote.Name }}"
+      - type: 'menuFromCommand'
+        title: 'Remote branch:'
+        command: 'git branch  -r --list {{index .PromptResponses 0}}/*'
+        filter: '.*{{index .PromptResponses 0}}/(?P<branch>.*)'
+        valueFormat: '{{ .branch }}'
+        labelFormat: '{{ .branch | green }}'
 ```
 
 Looking at the command assigned to the 'n' key, here's what the result looks like:
 
 ![](../../assets/custom-command-keybindings.gif)
 
-Custom command keybindings will appear alongside inbuilt keybindings when you view the keybindings menu by pressing '?':
+Custom command keybindings will appear alongside inbuilt keybindings when you view the options menu by pressing 'x':
 
 ![](https://i.imgur.com/QB21FPx.png)
 
 For a given custom command, here are the allowed fields:
 | _field_ | _description_ | required |
 |-----------------|----------------------|-|
-| key | The key to trigger the command. Use a single letter or one of the values from [here](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md) | yes |
-| command | The command to run (using Go template syntax for placeholder values) | yes |
-| context | The context in which to listen for the key (see [below](#contexts)) | yes |
-| subprocess | Whether you want the command to run in a subprocess (e.g. if the command requires user input) | no |
-| prompts | A list of prompts that will request user input before running the final command | no |
-| loadingText | Text to display while waiting for command to finish | no |
-| description | Label for the custom command when displayed in the keybindings menu | no |
-| stream | Whether you want to stream the command's output to the Command Log panel | no |
-| showOutput | Whether you want to show the command's output in a popup within Lazygit | no |
-| outputTitle | The title to display in the popup panel if showOutput is true. If left unset, the command will be used as the title. | no |
-| after | Actions to take after the command has completed | no |
+| key | the key to trigger the command. Use a single letter or one of the values from [here](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md) | yes |
+| command | the command to run | yes |
+| context | the context in which to listen for the key (see below) | yes |
+| subprocess | whether you want the command to run in a subprocess (necessary if you want to view the output of the command or provide user input) | no |
+| prompts | a list of prompts that will request user input before running the final command | no |
+| loadingText | text to display while waiting for command to finish | no |
+| description | text to display in the keybindings menu that appears when you press 'x' | no |
 
-Here are the options for the `after` key:
-| _field_ | _description_ | required |
-|-----------------|----------------------|-|
-| checkForConflicts | true/false. If true, check for merge conflicts | no |
-
-## Contexts
+### Contexts
 
 The permitted contexts are:
 
 | _context_      | _description_                                                                                            |
 | -------------- | -------------------------------------------------------------------------------------------------------- |
-| status         | The 'Status' tab                                                                                         |
-| files          | The 'Files' tab                                                                                          |
-| worktrees      | The 'Worktrees' tab                                                                                      |
-| localBranches  | The 'Local Branches' tab                                                                                 |
-| remotes        | The 'Remotes' tab                                                                                        |
-| remoteBranches | The context you get when pressing enter on a remote in the remotes tab                                   |
-| tags           | The 'Tags' tab                                                                                           |
-| commits        | The 'Commits' tab                                                                                        |
-| reflogCommits  | The 'Reflog' tab                                                                                         |
-| subCommits     | The context you see when pressing enter on a branch                                                      |
-| commitFiles    | The context you see when pressing enter on a commit or stash entry (warning, might be renamed in future) |
-| stash          | The 'Stash' tab                                                                                          |
-| global         | This keybinding will take affect everywhere                                                              |
+| status         | the 'Status' tab                                                                                         |
+| files          | the 'Files' tab                                                                                          |
+| localBranches  | the 'Local Branches' tab                                                                                 |
+| remotes        | the 'Remotes' tab                                                                                        |
+| remoteBranches | the context you get when pressing enter on a remote in the remotes tab                                   |
+| tags           | the 'Tags' tab                                                                                           |
+| commits        | the 'Commits' tab                                                                                        |
+| reflogCommits  | the 'Reflog' tab                                                                                         |
+| subCommits     | the context you see when pressing enter on a branch                                                      |
+| commitFiles    | the context you see when pressing enter on a commit or stash entry (warning, might be renamed in future) |
+| stash          | the 'Stash' tab                                                                                          |
+| global         | this keybinding will take affect everywhere                                                              |
 
-## Prompts
+### Prompts
 
-### Common fields
+The permitted prompt fields are:
 
-These fields are applicable to all prompts.
-
-| _field_           | _description_                                                                                  | _required_ |
-| ------------      | -----------------------------------------------------------------------------------------------| ---------- |
-| type              | One of 'input', 'confirm', 'menu', 'menuFromCommand'                                                           | yes        |
-| title             | The title to display in the popup panel                                                        | no         |
-| key | Used to reference the entered value from within the custom command. E.g. a prompt with `key: 'Branch'` can be referred to as `{{.Form.Branch}}` in the command | yes |
-
-### Input
-
-| _field_           | _description_                                                                                  | _required_ |
-| ------------      | -----------------------------------------------------------------------------------------------| ---------- |
-| initialValue      | The initial value to appear in the text box               | no         |
-| suggestions       | Shows suggestions as the input is entered. See below for details                                                          | no         |
-
-The permitted suggestions fields are:
-| _field_ | _description_ | _required_ |
-|-----------------|----------------------|-|
-| preset | Uses built-in logic to obtain the suggestions. One of 'authors', 'branches', 'files', 'refs', 'remotes', 'remoteBranches', 'tags' | no |
-| command | Command to run such that each line in the output becomes a suggestion. Mutually exclusive with 'preset' field. | no |
-
-Here's an example of passing a preset:
-
-```yml
-customCommands:
-  - key: 'a'
-    command: 'echo {{.Form.Branch | quote}}'
-    context: 'commits'
-    prompts:
-      - type: 'input'
-        title: 'Which branch?'
-        key: 'Branch'
-        suggestions:
-          preset: 'branches' # use built-in logic for obtaining branches
-```
-
-Here's an example of passing a command directly:
-
-```yml
-customCommands:
-  - key: 'a'
-    command: 'echo {{.Form.Branch | quote}}'
-    context: 'commits'
-    prompts:
-      - type: 'input'
-        title: 'Which branch?'
-        key: 'Branch'
-        suggestions:
-          command: "git branch --format='%(refname:short)'"
-```
-
-
-Here's an example of passing an initial value for the input:
-
-```yml
-customCommands:
-  - key: 'a'
-    command: 'echo {{.Form.Remote | quote}}'
-    context: 'commits'
-    prompts:
-    - type: 'input'
-      title: 'Remote:'
-      key: 'Remote'
-      initialValue: "{{.SelectedRemote.Name}}"
-```
-
-### Confirm
-
-| _field_           | _description_                                                                                  | _required_ |
-| ------------      | -----------------------------------------------------------------------------------------------| ---------- |
-| body              | The immutable body text to appear in the text box       | no         |
-
-Example:
-
-```yml
-customCommands:
-  - key: 'a'
-    command: 'echo "pushing to remote"'
-    context: 'commits'
-    prompts:
-    - type: 'confirm'
-      title: 'Push to remote'
-      body: 'Are you sure you want to push to the remote?'
-```
-
-### Menu
-
-| _field_           | _description_                                                                                  | _required_ |
-| ------------      | -----------------------------------------------------------------------------------------------| ---------- |
-| options           | The options to display in the menu                         | yes         |
+| _field_           | _description_                                                                    | _required_ |
+| ------------      | -------------------------------------------------------------------------------- | ---------- |
+| type              | one of 'input' or 'menu'                                                         | yes        |
+| title             | the title to display in the popup panel                                          | no         |
+| initialValue      | (only applicable to 'input' prompts) the initial value to appear in the text box | no         |
+| options           | (only applicable to 'menu' prompts) the options to display in the menu           | no         |
+| command           | (only applicable to 'menuFromCommand' prompts) the command to run to generate    | yes        |
+|                   | menu options                                                                     |            |
+| filter            | (only applicable to 'menuFromCommand' prompts) the regexp to run specifying      | yes        |
+|                   | groups which are going to be kept from the command's output                      |            |
+| valueFormat       | (only applicable to 'menuFromCommand' prompts) how to format matched groups from | yes        |
+|                   | the filter to construct a menu item's value (What gets appended to prompt        |            |
+|                   | responses when the item is selected). You can use named groups,                  |            |
+|                   | or `{{ .group_GROUPID }}`.                                                       |            |
+|                   | PS: named groups keep first match only                                           |            |
+| labelFormat       | (only applicable to 'menuFromCommand' prompts) how to format matched groups from | no         |
+|                   | the filter to construct the item's label (What's shown on screen). You can use   |            |
+|                   | named groups, or `{{ .group_GROUPID }}`. You can also color each match with      |            |
+|                   | `{{ .group_GROUPID | colorname }}` (Color names from                             |            |
+|                   | [here](https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md))     |            |
+|                   | If `labelFormat` is not specified, `valueFormat` is shown instead.               |            |
+|                   | PS: named groups keep first match only                                           |            |
 
 The permitted option fields are:
 | _field_ | _description_ | _required_ |
 |-----------------|----------------------|-|
-| name | The first part of the label | no |
-| description | The second part of the label | no |
-| value | the value that will be used in the command | yes |
+| name | the string which will appear first on the line | no |
+| description | the string which will appear second on the line | no |
+| value | the value that will be stored in `.PromptResponses` if the option is selected | yes |
 
 If an option has no name the value will be displayed to the user in place of the name, so you're allowed to only include the value like so:
 
 ```yml
-customCommands:
-  - key: 'a'
-    command: 'echo {{.Form.BranchType | quote}}'
-    context: 'commits'
     prompts:
       - type: 'menu'
         title: 'What kind of branch is it?'
-        key: 'BranchType'
         options:
           - value: 'feature'
           - value: 'hotfix'
           - value: 'release'
 ```
 
-Here's an example of supplying more detail for each option:
+### Placeholder values
 
-```yml
-customCommands:
-  - key: 'a'
-    command: 'echo {{.Form.BranchType | quote}}'
-    context: 'commits'
-    prompts:
-      - type: 'menu'
-        title: 'What kind of branch is it?'
-        key: 'BranchType'
-        options:
-          - value: 'feature'
-            name: 'feature branch'
-            description: 'branch based off develop'
-          - value: 'hotfix'
-            name: 'hotfix branch'
-            description: 'branch based off main for fast bug fixes'
-          - value: 'release'
-            name: 'release branch'
-            description: 'branch for a release'
-```
-
-### Menu-from-command
-
-| _field_           | _description_                                                                                  | _required_ |
-| ------------      | -----------------------------------------------------------------------------------------------| ---------- |
-| command           | The command to run to generate menu options                  | yes        |
-| filter            | The regexp to run specifying groups which are going to be kept from the command's output      | no        |
-| valueFormat       | How to format matched groups from the filter to construct a menu item's value | no        |
-| labelFormat       | Like valueFormat but for the labels. If `labelFormat` is not specified, `valueFormat` is shown instead. | no         |
-
-Here's an example using named groups in the regex. Notice how we can pipe the label to a colour function for coloured output (available colours [here](https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md))
-
-```yml
-  - key : 'a'
-    description: 'Checkout a remote branch as FETCH_HEAD'
-    command: "git fetch {{.Form.Remote}} {{.Form.Branch}} && git checkout FETCH_HEAD"
-    context: 'remotes'
-    prompts:
-      - type: 'menuFromCommand'
-        title: 'Remote branch:'
-        key: 'Branch'
-        command: 'git branch  -r --list {{.SelectedRemote.Name }}/*'
-        filter: '.*{{.SelectedRemote.Name }}/(?P<branch>.*)'
-        valueFormat: '{{ .branch }}'
-        labelFormat: '{{ .branch | green }}'
-```
-
-Here's an example using unnamed groups:
-
-```yml
-  - key : 'a'
-    description: 'Checkout a remote branch as FETCH_HEAD'
-    command: "git fetch {{.Form.Remote}} {{.Form.Branch}} && git checkout FETCH_HEAD"
-    context: 'remotes'
-    prompts:
-      - type: 'menuFromCommand'
-        title: 'Remote branch:'
-        key: 'Branch'
-        command: 'git branch  -r --list {{.SelectedRemote.Name }}/*'
-        filter: '.*{{.SelectedRemote.Name }}/(.*)'
-        valueFormat: '{{ .group_1 }}'
-        labelFormat: '{{ .group_1 | green }}'
-```
-
-Here's an example using a command but not specifying anything else: so each line from the command becomes the value and label of the menu items
-
-```yml
-  - key : 'a'
-    description: 'Checkout a remote branch as FETCH_HEAD'
-    command: "open {{.Form.File | quote}}"
-    context: 'global'
-    prompts:
-      - type: 'menuFromCommand'
-        title: 'File:'
-        key: 'File'
-        command: 'ls'
-```
-
-## Placeholder values
-
-Your commands can contain placeholder strings using Go's [template syntax](https://jan.newmarch.name/golang/template/chapter-template.html). The template syntax is pretty powerful, letting you do things like conditionals if you want, but for the most part you'll simply want to be accessing the fields on the following objects:
+Your commands can contain placeholder strings using Go's [template syntax](https://jan.newmarch.name/go/template/chapter-template.html). The template syntax is pretty powerful, letting you do things like conditionals if you want, but for the most part you'll simply want to be accessing the fields on the following objects:
 
 ```
 SelectedLocalCommit
 SelectedReflogCommit
 SelectedSubCommit
 SelectedFile
-SelectedPath
 SelectedLocalBranch
 SelectedRemoteBranch
 SelectedRemote
 SelectedTag
 SelectedStashEntry
 SelectedCommitFile
-SelectedWorktree
 CheckedOutBranch
 ```
 
-To see what fields are available on e.g. the `SelectedFile`, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/gui/services/custom_commands/models.go) (all the modelling lives in the same file).
+To see what fields are available on e.g. the `SelectedFile`, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/commands/models/file.go) (all the modelling lives in the same directory). Note that the custom commands feature does not guarantee backwards compatibility (until we hit lazygit version 1.0 of course) which means a field you're accessing on an object may no longer be available from one release to the next. Typically however, all you'll need is `{{.SelectedFile.Name}}`, `{{.SelectedLocalCommit.Sha}}` and `{{.SelectedBranch.Name}}`. In the future we will likely introduce a tighter interface that exposes a limited set of fields for each model.
 
-## Keybinding collisions
+### Keybinding collisions
 
 If your custom keybinding collides with an inbuilt keybinding that is defined for the same context, only the custom keybinding will be executed. This also applies to the global context. However, one caveat is that if you have a custom keybinding defined on the global context for some key, and there is an in-built keybinding defined for the same key and for a specific context (say the 'files' context), then the in-built keybinding will take precedence. See how to change in-built keybindings [here](https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#keybindings)
 
-## Debugging
+### Debugging
 
-If you want to verify that your command actually does what you expect, you can wrap it in an 'echo' call and set `showOutput: true` so that it doesn't actually execute the command but you can see how the placeholders were resolved.
+If you want to verify that your command actually does what you expect, you can wrap it in an 'echo' call and set `subprocess: true` so that it doesn't actually execute the command but you can see how the placeholders were resolved. Alternatively you can run lazygit in debug mode with `lazygit --debug` and in another terminal window run `lazygit --logs` to see which commands are actually run
 
-## More Examples
+### More Examples
 
 See the [wiki](https://github.com/jesseduffield/lazygit/wiki/Custom-Commands-Compendium) page for more examples, and feel free to add your own custom commands to this page so others can benefit!

docs/Custom_Pagers.md

@@ -1,6 +1,6 @@
 # Custom Pagers
 
-Lazygit supports custom pagers, [configured](/docs/Config.md) in the config.yml file (which can be opened by pressing `e` in the Status panel).
+Lazygit supports custom pagers, [configured](/docs/Config.md) in the config.yml file (which can be opened by pressing `o` in the Status panel).
 
 Support does not extend to Windows users, because we're making use of a package which doesn't have Windows support.
 
@@ -62,25 +62,3 @@ git:
 ```
 
 If you set `useConfig: true`, lazygit will use whatever pager is specified in `$GIT_PAGER`, `$PAGER`, or your *git config*. If the pager ends with something like ` | less` we will strip that part out, because less doesn't play nice with our rendering approach. If the custom pager uses less under the hood, that will also break rendering (hence the `--paging=never` flag for the `delta` pager).
-
-## Using external diff commands
-
-Some diff tools can't work as a simple pager like the ones above do, because they need access to the entire diff, so just post-processing git's diff is not enough for them. The most notable example is probably [difftastic](https://difftastic.wilfred.me.uk).
-
-These can be used in lazygit by using the `externalDiffCommand` config; in the case of difftastic, that could be
-
-```yaml
-git:
-  paging:
-    externalDiffCommand: difft --color=always
-```
-
-The `colorArg`, `pager`, and `useConfig` options are not used in this case.
-
-You can add whatever extra arguments you prefer for your difftool; for instance
-
-```yaml
-git:
-  paging:
-    externalDiffCommand: difft --color=always --display=inline --syntax-highlight=off
-```

docs/Fixup_Commits.md

@@ -1,65 +0,0 @@
-# Fixup Commits
-
-## Background
-
-There's this common scenario that you have a PR in review, the reviewer is
-requesting some changes, and you make those changes and would normally simply
-squash them into the original commit that they came from. If you do that,
-however, there's no way for the reviewer to see what you changed. You could just
-make a separate commit with those changes at the end of the branch, but this is
-not ideal because it results in a git history that is not very clean.
-
-To help with this, git has a concept of fixup commits: you do make a separate
-commit, but the subject of this commit is the string "fixup! " followed by the
-original commit subject. This both tells the reviewer what's going on (you are
-making a change that you later will squash into the designated commit), and it
-provides an easy way to actually perform this squash operation when you are
-ready to do that (before merging).
-
-## Creating fixup commits
-
-You could of course create fixup commits manually by typing in the commit
-message with the prefix yourself. But lazygit has an easier way to do that:
-in the Commits view, select the commit that you want to create a fixup for, and
-press shift-F (for "Create fixup commit for this commit"). This automatically
-creates a commit with the appropriate subject line.
-
-Don't confuse this with the lowercase "f" command ("Fixup commit"); that one
-squashes the selected commit into its parent, this is not what we want here.
-
-## Creating amend commits
-
-There's a special type of fixup commit that uses "amend!" instead of "fixup!" in
-the commit message subject; in addition to fixing up the original commit with
-changes it allows you to also (or only) change the commit message of the
-original commit. The menu that appears when pressing shift-F has options for
-both of these; they bring up a commit message panel similar to when you reword a
-commit, but then create the "amend!" commit containing the new message. Note
-that in that panel you only type the new message as you want it to be
-eventually; lazygit then takes care of formatting the "amend!" commit
-appropriately for you (with the subject of your new message moving into the body
-of the "amend!" commit).
-
-## Squashing fixup commits
-
-When you're ready to merge the branch and want to squash all these fixup commits
-that you created, that's very easy to do: select the first commit of your branch
-and hit shift-S (for "Squash all 'fixup!' commits above selected commit
-(autosquash)"). Boom, done.
-
-## Finding the commit to create a fixup for
-
-When you are making changes to code that you changed earlier in a long branch,
-it can be tedious to find the commit to squash it into. Lazygit has a command to
-help you with this, too: in the Files view, press ctrl-f to select the right
-base commit in the Commits view automatically. From there, you can either press
-shift-F to create a fixup commit for it, or shift-A to amend your changes into
-the commit if you haven't published your branch yet.
-
-If you have many modifications in your working copy, it is a good idea to stage
-related changes that are meant to go into the same fixup commit; if no changes
-are staged, ctrl-f works on all unstaged modifications, and then it might show
-an error if it finds multiple different base commits. If you are interested in
-what the command does to do its magic, and how you can help it work better, you
-may want to read the [design document](dev/Find_Base_Commit_For_Fixup_Design.md)
-that describes this.

docs/Integration_Tests.md

@@ -0,0 +1,119 @@
+# How To Make And Run Integration Tests For lazygit
+
+Integration tests are located in `test/integration`. Each test will run a bash script to prepare a test repo, then replay a recorded lazygit session from within that repo, and then the resultant repo will be compared to an expected repo that was created upon the initial recording. Each integration test lives in its own directory, and the name of the directory becomes the name of the test. Within the directory must be the following files:
+
+### `test.json`
+
+An example of a `test.json` is:
+
+```
+{ "description": "stage a file and commit the change", "speed": 20 }
+```
+
+The `speed` key refers to the playback speed as a multiple of the original recording speed. So 20 means the test will run 20 times faster than the original recording speed. If a test fails for a given speed, it will drop the speed and re-test, until finally attempting the test at the original speed. If you omit the speed, it will default to 10.
+
+### `setup.sh`
+
+This is a bash script containing the instructions for creating the test repo from scratch. For example:
+
+```
+#!/bin/sh
+
+cd $1
+
+git init
+
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+echo test1 > myfile1
+git add .
+git commit -am "myfile1"
+```
+
+## Running tests
+
+### From a TUI
+
+You can run/record/sandbox tests via a TUI with the following command:
+
+```
+go run test/lazyintegration/main.go
+```
+
+This TUI makes much of the following documentation redundant, but feel free to read through anyway!
+
+### From command line
+
+To run all tests - assuming you're at the project root:
+
+```
+go test ./pkg/gui/
+```
+
+To run them in parallel
+
+```
+PARALLEL=true go test ./pkg/gui
+```
+
+To run a single test
+
+```
+go test ./pkg/gui -run /<test name>
+# For example, to run the `tags` test:
+go test ./pkg/gui -run /tags
+```
+
+To run a test at a certain speed
+
+```
+SPEED=2 go test ./pkg/gui -run /<test name>
+```
+
+To update a snapshot
+
+```
+MODE=updateSnapshot go test ./pkg/gui -run /<test name>
+```
+
+## Creating a new test
+
+To create a new test:
+
+1. Copy and paste an existing test directory and rename the new directory to whatever you want the test name to be. Update the test.json file's description to describe your test.
+2. Update the `setup.sh` any way you like
+3. If you want to have a config folder for just that test, create a `config` directory to contain a `config.yml` and optionally a `state.yml` file. Otherwise, the `test/default_test_config` directory will be used.
+4. From the lazygit root directory, run:
+
+```
+MODE=record go test ./pkg/gui -run /<test name>
+```
+
+5. Feel free to re-attempt recording as many times as you like. In the absence of a proper testing framework, the more deliberate your keypresses, the better!
+6. Once satisfied with the recording, stage all the newly created files: `test.json`, `setup.sh`, `recording.json` and the `expected` directory that contains a copy of the repo you created.
+
+The resulting directory will look like:
+
+```
+actual/ (the resulting repo after running the test, ignored by git)
+expected/ (the 'snapshot' repo)
+config/ (need not be present)
+test.json
+setup.sh
+recording.json
+```
+
+Feel free to create a hierarchy of directories in the `test/integration` directory to group tests by feature.
+
+## Sandboxing
+
+The integration tests serve a secondary purpose of providing a setup for easy sandboxing. If you want to run a test in sandbox mode (meaning the session won't be recorded and we won't create/update snapshots), go:
+
+```
+MODE=sandbox go test ./pkg/gui -run /<test name>
+```
+
+## Feedback
+
+If you think this process can be improved, let me know! It shouldn't be too hard to change things.

docs/README.md

@@ -1,11 +1,7 @@
-# Documentation Overview
+# Documentation Overview 
 
 * [Configuration](./Config.md).
 * [Custom Commands](./Custom_Command_Keybindings.md)
 * [Custom Pagers](./Custom_Pagers.md)
-* [Dev docs](./dev)
 * [Keybindings](./keybindings)
 * [Undo/Redo](./Undoing.md)
-* [Range Select](./Range_Select.md)
-* [Searching/Filtering](./Searching.md)
-* [Stacked Branches](./Stacked_Branches.md)

docs/Range_Select.md

@@ -1,14 +0,0 @@
-# Range Select
-
-Some actions can be performed on a range of contiguous items. For example:
-* staging multiple files at once
-* squashing multiple commits at once
-* copying (for cherry-pick) multiple commits at once
-
-There are two ways to select a range of items:
-1. Sticky range select: Press 'v' to toggle range select, then expand the selection using the up/down arrow key. To reset the selection, press 'v' again.
-2. Non-sticky range select: Press shift+up or shift+down to expand the selection. To reset the selection, press up/down without shift.
-
-The sticky option will be more familiar to vim users, and the second option will feel more natural to users who aren't used to doing things in a modal way.
-
-In order to perform an action on a range of items, simply press the normal key for that action. If the action only works on individual items, it will raise an error. This is a new feature and the plan is to incrementally support range select for more and more actions. If there is an action you would like to support range select which currently does not, please raise an issue in the repo.

docs/Searching.md

@@ -1,21 +0,0 @@
-# Searching/Filtering
-
-## View searching/filtering
-
-Depending on the currently focused view, hitting '/' will bring up a filter or search prompt. When filtering, the contents of the view will be filtered down to only those lines which match the query string. When searching, the contents of the view are not filtered, but matching lines are highlighted and you can iterate through matches with `n`/`N`.
-
-We intend to support filtering for the files view soon, but at the moment it uses searching. We intend to continue using search for the commits view because you typically care about the commits that come before/after a matching commit.
-
-If you would like both filtering and searching to be enabled on a given view, please raise an issue for this.
-
-## Filtering files by status
-
-You can filter the files view to only show staged/unstaged files by pressing `<c-b>` in the files view.
-
-## Filtering commits by file path
-
-You can filter the commits view to only show commits which contain changes to a given file path.
-
-You can do this in a couple of ways:
-1) Start lazygit with the -f flag e.g. `lazygit -f my/path`
-2) From within lazygit, press `<c-s>` and then enter the path of the file you want to filter by

docs/Stacked_Branches.md

@@ -1,18 +0,0 @@
-# Working with stacked branches
-
-When working on a large branch it can often be useful to break it down into
-smaller pieces, and it can help to create separate branches for each independent
-chunk of changes. For example, you could have one branch for preparatory
-refactorings, one for backend changes, and one for frontend changes. Those
-branches would then all be stacked onto each other.
-
-Git has support for rebasing such a stack as a whole; you can enable it by
-setting the git config `rebase.updateRefs` to true. If you then rebase the
-topmost branch of the stack, the other ones in the stack will follow. This
-includes interactive rebases, so for example amending a commit in the first
-branch of the stack will "just work" in the sense that it keeps the other
-branches properly stacked onto it.
-
-Lazygit visualizes the individual branch heads in the stack by marking them with a
-cyan asterisk (or a cyan branch symbol if you are using [nerd
-fonts](Config.md#display-nerd-fonts-icons)).

docs/Undoing.md

@@ -1,9 +1,9 @@
 # Undo/Redo in lazygit
 
-You can undo the last action by pressing 'z' and redo with `ctrl+z`. Here we drop a couple of commits and then undo the actions.
-Undo uses the reflog which is specific to commits and branches so we can't undo changes to the working tree or stash.
+![Gif](../../assets/undo2.gif)
 
-![undo](../../assets/demo/undo-compressed.gif)
+## Keybindings:
+'z' to undo, 'ctrl+z' to redo
 
 ## How it works
 

docs/dev/Busy.md

@@ -1,78 +0,0 @@
-# Knowing when Lazygit is busy/idle
-
-## The use-case
-
-This topic deserves its own doc because there there are a few touch points for it. We have a use-case for knowing when Lazygit is idle or busy because integration tests follow the following process:
-1) press a key
-2) wait until Lazygit is idle
-3) run assertion / press another key
-4) repeat
-
-In the past the process was:
-1) press a key
-2) run assertion
-3) if assertion fails, wait a bit and retry
-4) repeat
-
-The old process was problematic because an assertion may give a false positive due to the contents of some view not yet having changed since the last key was pressed.
-
-## The solution
-
-First, it's important to distinguish three different types of goroutines:
-* The UI goroutine, of which there is only one, which infinitely processes a queue of events
-* Worker goroutines, which do some work and then typically enqueue an event in the UI goroutine to display the results
-* Background goroutines, which periodically spawn worker goroutines (e.g. doing a git fetch every minute)
-
-The point of distinguishing worker goroutines from background goroutines is that when any worker goroutine is running, we consider Lazygit to be 'busy', whereas this is not the case with background goroutines. It would be pointless to have background goroutines be considered 'busy' because then Lazygit would be considered busy for the entire duration of the program!
-
-In gocui, the underlying package we use for managing the UI and events, we keep track of how many busy goroutines there are using the `Task` type. A task represents some work being done by lazygit. The gocui Gui struct holds a map of tasks and allows creating a new task (which adds it to the map), pausing/continuing a task, and marking a task as done (which removes it from the map). Lazygit is considered to be busy so long as there is at least one busy task in the map; otherwise it's considered idle. When Lazygit goes from busy to idle, it notifies the integration test.
-
-It's important that we play by the rules below to ensure that after the user does anything, all the processing that follows happens in a contiguous block of busy-ness with no gaps.
-
-### Spawning a worker goroutine
-
-Here's the basic implementation of `OnWorker` (using the same flow as `WaitGroup`s):
-
-```go
-func (g *Gui) OnWorker(f func(*Task)) {
-	task := g.NewTask()
-	go func() {
-		f(task)
-		task.Done()
-	}()
-}
-```
-
-The crucial thing here is that we create the task _before_ spawning the goroutine, because it means that we'll have at least one busy task in the map until the completion of the goroutine. If we created the task within the goroutine, the current function could exit and Lazygit would be considered idle before the goroutine starts, leading to our integration test prematurely progressing.
-
-You typically invoke this with `self.c.OnWorker(f)`. Note that the callback function receives the task. This allows the callback to pause/continue the task (see below).
-
-### Spawning a background goroutine
-
-Spawning a background goroutine is as simple as:
-
-```go
-go utils.Safe(f)
-```
-
-Where `utils.Safe` is a helper function that ensures we clean up the gui if the goroutine panics.
-
-### Programmatically enqueueing a UI event
-
-This is invoked with `self.c.OnUIThread(f)`. Internally, it creates a task before enqueuing the function as an event (including the task in the event struct) and once that event is processed by the event queue (and any other pending events are processed) the task is removed from the map by calling `task.Done()`.
-
-### Pressing a key
-
-If the user presses a key, an event will be enqueued automatically and a task will be created before (and `Done`'d after) the event is processed.
-
-## Special cases
-
-There are a couple of special cases where we manually pause/continue the task directly in the client code. These are subject to change but for the sake of completeness:
-
-### Writing to the main view(s)
-
-If the user focuses a file in the files panel, we run a `git diff` command for that file and write the output to the main view. But we only read enough of the command's output to fill the view's viewport: further loading only happens if the user scrolls. Given that we have a background goroutine for running the command and writing more output upon scrolling, we create our own task and call `Done` on it as soon as the viewport is filled.
-
-### Requesting credentials from a git command
-
-Some git commands (e.g. git push) may request credentials. This is the same deal as above; we use a worker goroutine and manually pause continue its task as we go from waiting on the git command to waiting on user input. This requires passing the task through to the `Push` method so that it can be paused/continued.

docs/dev/Codebase_Guide.md

@@ -1,94 +0,0 @@
-# Lazygit Codebase Guide
-
-## Packages
-
-* `pkg/app`: Contains startup code, inititalises a bunch of stuff like logging, the user config, etc, before starting the gui. Catches and handles some errors that the gui raises.
-* `pkg/app/daemon`: Contains code relating to the lazygit daemon. This could be better named: it's is not a daemon in the sense that it's a long-running background process; rather it's a short-lived background process that we pass to git for certain tasks, like GIT_EDITOR for when we want to set the TODO file for an interactive rebase.
-* `pkg/cheatsheet`: Generates the keybinding cheatsheets in `docs/keybindings`.
-* `pkg/commands/git_commands`: All communication to the git binary happens here. So for example there's a `Checkout` method which calls `git checkout`.
-* `pkg/commands/oscommands`: Contains code for talking to the OS, and for invoking commands in general
-* `pkg/commands/git_config`: Reading of the git config all happens here.
-* `pkg/commands/hosting_service`: Contains code that is specific to git hosting services (aka forges).
-* `pkg/commands/models`: Contains model structs that represent commits, branches, files, etc.
-* `pkg/commands/patch`: Contains code for parsing and working with git patches
-* `pkg/common`: Contains the `Common` struct which holds common dependencies like the logger, i18n, and the user config. Most structs in the code will have a field named `c` which holds a common struct (or a derivative of the common struct).
-* `pkg/config`: Contains code relating to the Lazygit user config. Specifically `pkg/config/user_config/go` defines the user config struct and its default values.
-* `pkg/constants`: Contains some constant strings (e.g. links to docs)
-* `pkg/env`: Contains code relating to setting/getting environment variables
-* `pkg/i18n`: Contains internationalised strings
-* `pkg/integration`: Contains end-to-end tests
-* `pkg/jsonschema`: Contains generator for user config JSON schema.
-* `pkg/logs`: Contains code for instantiating the logger and for tailing the logs via `lazygit --logs`
-* `pkg/tasks`: Contains code for running asynchronous tasks: mostly related to efficiently rendering command output to the main window.
-* `pkg/theme`: Contains code related to colour themes.
-* `pkg/updates`: Contains code related to Lazygit updates (checking for update, download and installing the update)
-* `pkg/utils`: Contains lots of low-level helper functions
-* `pkg/gui`: Contains code related to the gui. We've still got a God Struct in the form of our Gui struct, but over time code has been moved out into contexts, controllers, and helpers, and we intend to continue moving more code out over time.
-* `pkg/gui/context`: Contains code relating to contexts. There is a context for each view e.g. a branches context, a tags context, etc. Contexts manage state related to the view and receive keypresses.
-* `pkg/gui/controllers`: Contains code relating to controllers. Controllers define a list of keybindings and their associated handlers. One controller can be assigned to multiple contexts, and one context can contain multiple controllers.
-* `pkg/gui/controllers/helpers`: Contains code that is shared between multiple controllers.
-* `pkg/gui/filetree`: Contains code relating to the representation of filetrees.
-* `pkg/gui/keybindings`: Contains code for mapping between keybindings and their labels
-* `pkg/gui/mergeconflicts`: Contains code relating to the handling of merge conflicts
-* `pkg/gui/modes`: Contains code relating to the state of different modes e.g. cherry picking mode, rebase mode.
-* `pkg/gui/patch_exploring`: Contains code relating to the state of patch-oriented views like the staging view.
-* `pkg/gui/popup`: Contains code that lets you easily raise popups
-* `pkg/gui/presentation`: Contains presentation code i.e. code concerned with rendering content inside views
-* `pkg/gui/services/custom_commands`: Contains code related to user-defined custom commands.
-* `pkg/gui/status`: Contains code for invoking loaders and toasts
-* `pkg/gui/style`: Contains code for specifying text styles (colour, bold, etc)
-* `pkg/gui/types`: Contains various gui-specific types and interfaces. Lots of code lives here to avoid circular dependencies
-* `vendor/github.com/jesseduffield/gocui`: Gocui is the underlying library used for handling the gui event loop, handling keypresses, and rendering the UI. It defines the View struct which our own context structs build upon.
-
-## Important files
-
-* `pkg/config/user_config.go`: defines the user config and default values
-* `pkg/gui/keybindings.go`: defines keybindings which have not yet been moved into a controller (originally all keybindings were defined here)
-* `pkg/gui/controllers.go`: links up controllers with contexts
-* `pkg/gui/controllers/helpers/helpers.go`: defines all the different helper structs
-* `pkg/commands/git.go`: defines all the different git command structs
-* `pkg/gui/gui.go`: defines the top-level gui state and gui initialisation/run code
-* `pkg/gui/layout.go`: defines what happens on each render
-* `pkg/gui/controllers/helpers/window_arrangement_helper.go`: defines the layout of the UI and the size/position of each window
-* `pkg/gui/context/context.go`: defines the different contexts
-* `pkg/gui/context/setup.go`: defines initialisation code for all contexts
-* `pkg/gui/context.go`: manages the lifecycle of contexts, the context stack, and focus changes.
-* `pkg/gui/types/views.go`: defines views
-* `pkg/gui/views.go`: defines the ordering of views (front to back) and their initialisation code
-* `pkg/gui/gui_common.go`: defines gui-specific methods that all controllers and helpers have access to
-* `pkg/i18n/english.go`: defines the set of i18n strings and their English values
-* `pkg/gui/controllers/helpers/refresh_helper.go`: manages refreshing of models. The refresh helper is typically invoked at the end of an action to re-load affected models from git (e.g. re-load branches after doing a git pull)
-* `pkg/gui/controllers/quit_actions.go`: contains code that runs when you hit 'escape' on a view (assuming the view doesn't define its own escape handler)
-* `vendor/github.com/jesseduffield/gocui/gui.go`: defines the gocui gui struct
-* `vendor/github.com/jesseduffield/gocui/view.go`: defines the gocui view struct
-
-## Concepts
-
-* **View**: Views are defined in the gocui package, and they maintain an internal buffer of content which is rendered each time the screen is drawn.
-* **Context**: A context is tied to a view and contains some additional state and logic specific to that view e.g. the branches context has code relating specifically to branches, and writes the list of branches to the branches view. Views and contexts share some responsibilities for historical reasons.
-* **Controller**: A controller defined keybindings with associated handlers. One controller can be assigned to multiple contexts and one context can have multiple controllers. For example the list controller handles keybindings relating to navigating a list, and is assigned to all list contexts (e.g. the branches context).
-* **Helper**: A helper defines shared code used by controllers, or used by some other parts of the application. Often a controller will have a method that ends up needing to be used by another controller, so in that case we move the method out into a helper so that both controllers can use it. We need to do this because controllers cannot refer to other controllers' methods.
-
-In terms of dependencies, controllers sit at the highest level, so they can refer to helpers, contexts, and views (although it's preferable for view-specific code to live in contexts). Helpers can refer to contexts and views, and contexts can only refer to views. Views can't refer to contexts, controllers, or helpers.
-
-* **Window**: A window is a section of the screen which will render a view. Windows are named after the default view that appears there, so for example there is a 'stash' window that is so named because by default the stash view appears there. But if you press enter on a stash entry, the stash entry's files will be shown in a different view, but in the same window.
-* **Panel**: The term 'panel' is still used in a few places to refer to either a view or a window, and it's a term that is now deprecated in favour of 'view' and 'window'.
-* **Tab**: Each tab in a window (e.g. Files, Worktrees, Submodules) actually has a corresponding view which we bring to the front upon changing tabs.
-* **Model**: Representation of a git object e.g. commits, branches, files.
-* **ViewModel**: Used by a context to maintain state related to the view.
-* **Keybinding**: A keybinding associates a _key_ with an _action_. For example if you press the 'down' arrow, the action performed will be your cursor moving down a list by one.
-* **Action**: An action is the thing that happens when you press a key. Often an action will invoke a git command, but not always: for example, navigation actions don't involve git.
-* **Common structs**: Most structs have a field named `c` which contains a 'common' struct: a struct containing a bag of dependencies that most structs of the same layer require. For example if you want to access a helper from a controller you can do so with `self.c.Helpers.MyHelper`.
-
-## Event loop and threads
-
-The event loop is managed in the `MainLoop` function of `vendor/github.com/jesseduffield/gocui/gui.go`. Any time there is an event like a key press or a window resize, the event will be processed and then the screen will be redrawn. This involves calling the `layout` function defined in `pkg/gui/layout.go`, which lays out the windows and invokes some on-render hooks.
-
-Often, as part of handling a keypress, we'll want to run some code asynchronously so that it doesn't block the UI thread. For this we'll typically run `self.c.OnWorker(myFunc)`. If the worker wants to then do something on the UI thread again it can call `self.c.OnUIThread(myOtherFunc)`.
-
-## Legacy code structure
-
-Before we had controllers and contexts, all the code lived directly in the gui package under a gui God Struct. This was fairly bloated and so we split things out to have a better separation of concerns. Nonetheless, it's a big effort to migrate all the code so we still have some logic in the gui struct that ought to live somewhere else. Likewise, we have some keybindings defined in `pkg/gui/keybindings.go` that ought to live on a controller (all keybindings used to be defined in that one file).
-
-The new structure has its own problems: we don't have a clear guide on whether code should live in a controller or helper. The current approach is to put code in a controller until it's needed by another controller, and to then extract it out into a helper. We may be better off just putting code in helpers to start with and leaving controllers super-thin, with the responsibility of just pairing keys with corresponding helper functions. But it's not clear to me if that would be better than the current approach.
-

docs/dev/Demo_Recordings.md

@@ -1,82 +0,0 @@
-# Demo Recordings
-
-We want our demo recordings to be consistent and easy to update if we make changes to Lazygit's UI. Luckily for us, we have an existing recording system for the sake of our integration tests, so we can piggyback on that.
-
-You'll want to familiarise yourself with how integration tests are written: see [here](../../pkg/integration/README.md).
-
-## Prerequisites
-
-Ideally we'd run this whole thing through docker but we haven't got that working. So you will need:
-```
-# for recording
-npm i -g terminalizer
-# for gif compression
-npm i -g gifsicle
-# for mp4 conversion
-brew install ffmpeg
-
-# font with icons
-wget https://github.com/ryanoasis/nerd-fonts/releases/download/v3.0.2/DejaVuSansMono.tar.xz && \
-  tar -xf DejaVuSansMono.tar.xz -C /usr/local/share/fonts && \
-  rm DejaVuSansMono.tar.xz
-```
-
-## Creating a demo
-
-Demos are found in `pkg/integration/tests/demo/`. They are like regular integration tests but have `IsDemo: true` which has a few effects:
-* The bottom row of the UI is quieter so that we can render captions
-* Fetch/Push/Pull have artificial latency to mimic a network request
-* The loader at the bottom-right does not appear
-
-In demos, we don't need to be as strict in our assertions as we are in tests. But it's still good to have some basic assertions so that if we automate the process of updating demos we'll know if one of them has broken.
-
-You can use the same flow as we use with integration tests when you're writing a demo:
-* Setup the repo
-* Run the demo in sandbox mode to get a feel of what needs to happen
-* Come back and write the code to make it happen
-
-### Adding captions
-
-It's good to add captions explaining what task if being performed. Use the existing demos as a guide.
-
-### Setting up the assets worktree
-
-We store assets (which includes demo recordings) in the `assets` branch, which is a branch that shares no history with the main branch and exists purely for storing assets. Storing them separately means we don't clog up the code branches with large binaries.
-
-The scripts and demo definitions live in the code branches but the output lives in the assets branch so to be able to create a video from a demo you'll need to create a linked worktree for the assets branch which you can do with:
-
-```sh
-git worktree add .worktrees/assets assets
-```
-
-Outputs will be stored in `.worktrees/assets/demos/`. We'll store three separate things:
-* the yaml of the recording
-* the original gif
-* either the compressed gif or the mp4 depending on the output you chose (see below)
-
-### Recording the demo
-
-Once you're happy with your demo you can record it using:
-```sh
-scripts/record_demo.sh [gif|mp4] <path>
-# e.g.
-scripts/record_demo.sh gif pkg/integration/tests/demo/interactive_rebase.go
-```
-
-~~The gif format is for use in the first video of the readme (it has a larger size but has auto-play and looping)~~
-~~The mp4 format is for everything else (no looping, requires clicking, but smaller size).~~
-
-Turns out that you can't store mp4s in a repo and link them from a README so we're gonna just use gifs across the board for now.
-
-### Including demos in README/docs
-
-If you've followed the above steps you'll end up with your output in your assets worktree.
-
-Within that worktree, stage all three output files and raise a PR against the assets branch.
-
-Then back in the code branch, in the doc, you can embed the recording like so:
-```md
-![Nuke working tree](../assets/demo/interactive_rebase-compressed.gif)
-```
-
-This means we can update assets without needing to update the docs that embed them.

docs/dev/Find_Base_Commit_For_Fixup_Design.md

@@ -1,229 +0,0 @@
-# About the mechanics of lazygit's "Find base commit for fixup" command
-
-## Background
-
-Lazygit has a command called "Find base commit for fixup" that helps with
-creating fixup commits. (It is bound to "ctrl-f" by default, and I'll call it
-simply "the ctrl-f command" throughout the rest of this text for brevity.)
-
-It's a heuristic that needs to make a few assumptions; it tends to work well in
-practice if users are aware of its limitations. The user-facing side of the
-topic is explained [here](../Fixup_Commits.md). In this document we describe how
-it works internally, and the design decisions behind it.
-
-It is also interesting to compare it to the standalone tool
-[git-absorb](https://github.com/tummychow/git-absorb) which does a very similar
-thing, but made different decisions in some cases. We'll explore these
-differences in this document.
-
-## Design goals
-
-I'll start with git-absorb's design goals (my interpretation, since I can't
-speak for git-absorb's maintainer of course): its main goal seems to be minimum
-user interaction required. The idea is that you have a PR in review, the
-reviewer requested a bunch of changes, you make all these changes, so you have a
-working copy with lots of modified files, and then you fire up git-absorb and it
-creates all the necessary fixup commits automatically with no further user
-intervention.
-
-While this sounds attractive, it conflicts with ctrl-f's main design goal, which
-is to support creating high-quality fixups. My philosophy is that fixup commits
-should have the same high quality standards as normal commits; in particular:
-
-- they should be atomic. This means that multiple diff hunks that belong
-  together to form one logical change should be in the same fixup commit. (Not
-  always possible if the logical change needs to be fixed up into several
-  different base commits.)
-- they should be minimal. Every fixup commit should ideally contain only one
-  logical change, not several unrelated ones.
-
-Why is this important? Because fixup commits are mainly a tool for reviewing (if
-they weren't, you might as well squash the changes into their base commits right
-away). And reviewing fixup commits is easier if they are well-structured, just
-like normal commits.
-
-The only way to achieve this with git-absorb is to set the `oneFixupPerCommit`
-config option (for the first goal), and then manually stage the changes that
-belong together (for the second). This is close to what you have to do with
-ctrl-f, with one exception that we'll get to below.
-
-But ctrl-f enforces this by refusing to do the job if the staged hunks belong to
-more than one base commit. Git-absorb will happily create multiple fixup commits
-in this case; ctrl-f doesn't, to enforce that you pay attention to how you group
-the changes. There's another reason for this behavior: ctrl-f doesn't create
-fixup commits itself (unlike git-absorb), instead it just selects the found base
-commit so that the user can decide whether to amend the changes right in, or
-create a fixup commit from there (both are single-key commands in lazygit). And
-lazygit doesn't support non-contiguous multiselections of commits, but even if
-it did, it wouldn't help much in this case.
-
-## The mechanics
-
-### General approach
-
-Git-absorb uses a relatively simple approach, and the benefit is of course that
-it is easy to understand: it looks at every diff hunk separately, and for every
-hunk it looks at all commits (starting from the newest one backwards) to find
-the earliest commit that the change can be amended to without conflicts.
-
-It is important to realize that "diff hunk" doesn't necessarily mean what you
-see in the diff view. Git-absorb and ctrl-f both use a context of 0 when diffing
-your code, so they often see more and smaller hunks than users do. For example,
-moving a line of code down by one line is a single hunk for users, but it's two
-separate hunks for git-absorb and ctrl-f; one for deleting the line at the old
-place, and another one for adding the line at the new place, even if it's only
-one line further down.
-
-From this, it follows that there's one big problem with git-absorb's approach:
-when moving code, it doesn't realize that the two related hunks of deleting the
-code from the old place and inserting it at the new place belong together, and
-often it will manage to create a fixup commit for the first hunk, but leave the
-other hunk in your working copy as "don't know what to do with this". As an
-example, suppose your PR is adding a line of code to an existing function, maybe
-one that declares a new variable, and a reviewer suggests to move this line down
-a bit, closer to where some other related variables are declared. Moving the
-line down results in two diff hunks (from the perspective of git-absorb and
-ctrl-f, as they both use a context of 0 when diffing), and when looking at the
-second diff hunk in isolation there's no way to find a base commit in your PR
-for it, because the surrounding code is already on main.
-
-To solve this, the ctrl-f command makes a distinction between hunks that have
-deleted lines and hunks that have only added lines. If the whole diff contains
-any hunks that have deleted lines, it uses only those hunks to determine the
-base commit, and then assumes that all the hunks that have only added lines
-belong into the same commit. This nicely solves the above example of moving
-code, but also other examples such as the following:
-
-<details>
-<summary>Click to show example</summary>
-
-Suppose you have a PR in which you added the following function:
-
-```go
-func findCommit(hash string) (*models.Commit, int, bool) {
-	for i, commit := range self.c.Model().Commits {
-		if commit.Hash == hash {
-			return commit, i, true
-		}
-	}
-
-	return nil, -1, false
-}
-```
-
-A reviewer suggests to replace the manual `for` loop with a call to
-`lo.FindIndexOf` since that's less code and more idiomatic. So your modification
-is this:
-
-```diff
---- a/my_file.go
-+++ b/my_file.go
-@@ -12,2 +12,3 @@ import (
- 	"github.com/jesseduffield/lazygit/pkg/utils"
-+	"github.com/samber/lo"
- 	"golang.org/x/sync/errgroup"
-@@ -308,9 +309,5 @@ func (self *FixupHelper) blameAddedLines(addedLineHunks []*hunk) ([]string, erro
- func findCommit(hash string) (*models.Commit, int, bool) {
--	for i, commit := range self.c.Model().Commits {
--		if commit.Hash == hash {
--			return commit, i, true
--		}
--	}
--
--	return nil, -1, false
-+	return lo.FindIndexOf(self.c.Model().Commits, func(commit *models.Commit) bool {
-+		return commit.Hash == hash
-+	})
- }
-```
-
-If we were to look at these two hunks separately, we'd easily find the base
-commit for the second one, but we wouldn't find the one for the first hunk
-because the imports around the added import have been on main for a long time.
-In fact, git-absorb leaves this hunk in the working copy because it doesn't know
-what to do with it.
-
-</details>
-
-Only if there are no hunks with deleted lines does ctrl-f look at the hunks with
-only added lines and determines the base commit for them. This solves cases like
-adding a comment above a function that you added in your PR.
-
-The downside of this more complicated approach is that it relies on the user
-staging related hunks correctly. However, in my experience this is easy to do
-and not very error-prone, as long as users are aware of this behavior. Lazygit
-tries to help making them aware of it by showing a warning whenever there are
-hunks with only added lines in addition to hunks with deleted lines.
-
-### Finding the base commit for a given hunk
-
-As explained above, git-absorb finds the base commit by walking the commits
-backwards until it finds one that conflicts with the hunk, and then the found
-base commit is the one just before that one. This works reliably, but it is
-slow.
-
-Ctrl-f uses a different approach that is usually much faster, but should always
-yield the same result. Again, it makes a distinction between hunks with deleted
-lines and hunks with only added lines. For hunks with deleted lines it performs
-a line range blame for all the deleted lines (e.g. `git blame -L42,+3 --
-filename`), and if the result is the same for all deleted lines, then that's the
-base commit; otherwise it returns an error.
-
-For hunks with only added lines, it gets a little more complicated. We blame the
-single lines just before and just after the hunk (I'll ignore the edge cases of
-either of those not existing because the hunk is at the beginning or end of the
-file; read the code to see how we handle these cases). If the blame result is
-the same for both, then that's the base commit. This is the case of adding a
-line in the middle of a block of code that was added in the PR. Otherwise, the
-base commit is the more recent of the two (and in this case it doesn't matter if
-the other one is an earlier commit in the current branch, or a possibly very old
-commit that's already on main). This covers the common case of adding a comment
-to a function that was added in the PR, but also adding another line at the end
-of a block of code that was added in the base commit.
-
-It's interesting to discuss what "more recent" means here. You could say if
-commit A is an ancestor of commit B (or in other words, A is reachable from B)
-then B is the more recent one. And if none of the two commits is reachable from
-the other, you have an error case because it's unclear which of the two should
-be considered the base commit. The scenario in which this happens is a commit
-history like this:
-
-```
-      C---D
-     /     \
-A---B---E---F---G
-```
-
-where, for instance, D and E are the two blame results.
-
-Unfortunately, determining the ancestry relationship between two commits using
-git commands is a bit expensive and not totally straightforward. Fortunately,
-it's not necessary in lazygit because lazygit has the most recent 300 commits
-cached in memory, and can simply search its linear list of commits to see which
-one is closer to the beginning of the list. If only one of the two commits is
-found within those 300 commits, then that's the more recent one; if neither is
-found, we assume that both commits are on main and error out. In the merge
-scenario pictured above, we arbitrarily return one of the two commits (this will
-depend on the log order), but that's probably fine as this scenario should be
-extremely rare in practice; in most cases, feature branches are simply linear.
-
-### Knowing where to stop searching
-
-Git-absorb needs to know when to stop walking backwards searching for commits,
-since it doesn't make sense to create fixups for commits that are already on
-main. However, it doesn't know where the current branch ends and main starts, so
-it needs to rely on user input for this. By default it searches the most recent
-10 commits, but this can be overridden with a config setting. In longer branches
-this is often not enough for finding the base commit; but setting it to a higher
-value causes the command to take longer to complete when the base commit can't
-be found.
-
-Lazygit doesn't have this problem. For a given blame result it needs to
-determine whether that commit is already on main, and if it can find the commit
-in its cached list of the first 300 commits it can get that information from
-there, because lazygit knows what the user's configured main branches are
-(`master` and `main` by default, but it could also include branches like `devel`
-or `1.0-hotfixes`), and so it can tell for each commit whether it's contained in
-one of those main branches. And if it can't find it among the first 300 commits,
-it assumes the commit already on main, on the assumption that no feature branch
-has more than 300 commits.

docs/dev/Integration_Tests.md

@@ -1 +0,0 @@
-see new docs [here](../../pkg/integration/README.md)

docs/dev/Profiling.md

@@ -1,69 +0,0 @@
-# Profiling Lazygit
-
-If you want to investigate what's contributing to CPU or memory usage, start
-lazygit with the `-profile` command line flag. This tells it to start an
-integrated web server that listens for profiling requests.
-
-## Save profile data
-
-### CPU
-
-While lazygit is running with the `-profile` flag, perform a CPU profile and
-save it to a file by running this command in another terminal window:
-
-```sh
-curl -o cpu.out http://127.0.0.1:6060/debug/pprof/profile
-```
-
-By default, it profiles for 30 seconds. To change the duration, use
-
-```sh
-curl -o cpu.out 'http://127.0.0.1:6060/debug/pprof/profile?seconds=60'
-```
-
-### Memory
-
-To save a heap profile (containing information about all memory allocated so
-far since startup), use
-
-```sh
-curl -o mem.out http://127.0.0.1:6060/debug/pprof/heap
-```
-
-Sometimes it can be useful to get a delta log, i.e. to see how memory usage
-developed from one point in time to another. For that, use
-
-```sh
-curl -o mem.out 'http://127.0.0.1:6060/debug/pprof/heap?seconds=20'
-```
-
-This will log the memory usage difference between now and 20 seconds later, so
-it gives you 20 seconds to perform the action in lazygit that you are interested
-in measuring.
-
-## View profile data
-
-To display the profile data, you can either use speedscope.app, or the pprof
-tool that comes with go. I prefer the former because it has a nicer UI and is a
-little more powerful; however, I have seen cases where it wasn't able to load a
-profile for some reason, in which case it's good to have the pprof tool as a
-fallback.
-
-### Speedscope.app
-
-Go to https://www.speedscope.app/ in your browser, and drag the saved profile
-onto the browser window. Refer to [the
-documentation](https://github.com/jlfwong/speedscope?tab=readme-ov-file#usage)
-for how to navigate the data.
-
-### Pprof tool
-
-To view a profile that you saved as `cpu.out`, use
-
-```sh
-go tool pprof -http=:8080 cpu.out
-```
-
-By default this shows the graph view, which I don't find very useful myself.
-Choose "Flame Graph" from the View menu to show a much more useful
-representation of the data.

docs/dev/README.md

@@ -1,8 +0,0 @@
-# Dev Documentation Overview
-
-* [Codebase Guide](./Codebase_Guide.md)
-* [Busy/Idle Tracking](./Busy.md)
-* [Integration Tests](../../pkg/integration/README.md)
-* [Demo Recordings](./Demo_Recordings.md)
-* [Find base commit for fixup design](Find_Base_Commit_For_Fixup_Design.md)
-* [Profiling](Profiling.md)

docs/keybindings/Keybindings_en.md

@@ -1,364 +1,307 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+# This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root.
 
 # Lazygit Keybindings
 
-_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
+## Global Keybindings
 
-## Global keybindings
+<pre>
+  <kbd>ctrl+r</kbd>: switch to a recent repo (<c-r>)
+  <kbd>pgup</kbd>: scroll up main panel (fn+up)
+  <kbd>pgdown</kbd>: scroll down main panel (fn+down)
+  <kbd>m</kbd>: view merge/rebase options
+  <kbd>ctrl+p</kbd>: view custom patch options
+  <kbd>P</kbd>: push
+  <kbd>p</kbd>: pull
+  <kbd>R</kbd>: refresh
+  <kbd>x</kbd>: open menu
+  <kbd>z</kbd>: undo (via reflog) (experimental)
+  <kbd>ctrl+z</kbd>: redo (via reflog) (experimental)
+  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
+  <kbd>_</kbd>: prev screen mode
+  <kbd>:</kbd>: execute custom command
+  <kbd>ctrl+s</kbd>: view filter-by-path options
+  <kbd>W</kbd>: open diff menu
+  <kbd>ctrl+e</kbd>: open diff menu
+  <kbd>@</kbd>: open command log menu
+  <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
+  <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-r> `` | Switch to a recent repo |  |
-| `` <pgup> (fn+up/shift+k) `` | Scroll up main window |  |
-| `` <pgdown> (fn+down/shift+j) `` | Scroll down main window |  |
-| `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
-| `` P `` | Push | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view. |
-| `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view. |
-| `` : `` | Execute custom command | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
-| `` <c-p> `` | View custom patch options |  |
-| `` m `` | View merge/rebase options | View options to abort/continue/skip the current merge/rebase. |
-| `` R `` | Refresh | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
-| `` + `` | Next screen mode (normal/half/fullscreen) |  |
-| `` _ `` | Prev screen mode |  |
-| `` ? `` | Open keybindings menu |  |
-| `` <c-s> `` | View filter options | View options for filtering the commit log, so that only commits matching the filter are shown. |
-| `` W `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` <c-e> `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` q `` | Quit |  |
-| `` <esc> `` | Cancel |  |
-| `` <c-w> `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view. |
-| `` z `` | Undo | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
-| `` <c-z> `` | Redo | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
+## List Panel Navigation
 
-## List panel navigation
+<pre>
+  <kbd>.</kbd>: next page
+  <kbd>,</kbd>: previous page
+  <kbd><</kbd>: scroll to top
+  <kbd>></kbd>: scroll to bottom
+  <kbd>/</kbd>: start search
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` , `` | Previous page |  |
-| `` . `` | Next page |  |
-| `` < `` | Scroll to top |  |
-| `` > `` | Scroll to bottom |  |
-| `` v `` | Toggle range select |  |
-| `` <s-down> `` | Range select down |  |
-| `` <s-up> `` | Range select up |  |
-| `` / `` | Search the current view by text |  |
-| `` H `` | Scroll left |  |
-| `` L `` | Scroll right |  |
-| `` ] `` | Next tab |  |
-| `` [ `` | Previous tab |  |
+## Branches Panel (Branches Tab)
 
-## Commit files
+<pre>
+  <kbd>space</kbd>: checkout
+  <kbd>o</kbd>: create pull request
+  <kbd>O</kbd>: create pull request options
+  <kbd>ctrl+y</kbd>: copy pull request URL to clipboard
+  <kbd>c</kbd>: checkout by name
+  <kbd>F</kbd>: force checkout
+  <kbd>n</kbd>: new branch
+  <kbd>d</kbd>: delete branch
+  <kbd>r</kbd>: rebase checked-out branch onto this branch
+  <kbd>M</kbd>: merge into currently checked out branch
+  <kbd>i</kbd>: show git-flow options
+  <kbd>f</kbd>: fast-forward this branch from its upstream
+  <kbd>g</kbd>: view reset options
+  <kbd>R</kbd>: rename branch
+  <kbd>ctrl+o</kbd>: copy branch name to clipboard
+  <kbd>enter</kbd>: view commits
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Copy path to clipboard |  |
-| `` c `` | Checkout | Checkout file. This replaces the file in your working tree with the version from the selected commit. |
-| `` d `` | Remove | Discard this commit's changes to this file. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes this file. |
-| `` o `` | Open file | Open file in default application. |
-| `` e `` | Edit | Open file in external editor. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Enter file / Toggle directory collapsed | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
-| `` ` `` | Toggle file tree view | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` / `` | Search the current view by text |  |
+## Branches Panel (Remote Branches (in Remotes tab))
 
-## Commit summary
+<pre>
+  <kbd>esc</kbd>: Return to remotes list
+  <kbd>g</kbd>: view reset options
+  <kbd>enter</kbd>: view commits
+  <kbd>space</kbd>: checkout
+  <kbd>n</kbd>: new branch
+  <kbd>M</kbd>: merge into currently checked out branch
+  <kbd>d</kbd>: delete branch
+  <kbd>r</kbd>: rebase checked-out branch onto this branch
+  <kbd>u</kbd>: set as upstream of checked-out branch
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Confirm |  |
-| `` <esc> `` | Close |  |
+## Branches Panel (Remotes Tab)
 
-## Commits
+<pre>
+  <kbd>f</kbd>: fetch remote
+  <kbd>n</kbd>: add new remote
+  <kbd>d</kbd>: remove remote
+  <kbd>e</kbd>: edit remote
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Copy commit hash to clipboard |  |
-| `` <c-r> `` | Reset copied (cherry-picked) commits selection |  |
-| `` b `` | View bisect options |  |
-| `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
-| `` r `` | Reword | Reword the selected commit's message. |
-| `` R `` | Reword with editor |  |
-| `` d `` | Drop | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
-| `` e `` | Edit (start interactive rebase) | Edit the selected commit. Use this to start an interactive rebase from the selected commit. When already mid-rebase, this will mark the selected commit for editing, which means that upon continuing the rebase, the rebase will pause at the selected commit to allow you to make changes. |
-| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
-If you would instead like to start an interactive rebase from the selected commit, press `e`. |
-| `` p `` | Pick | Mark the selected commit to be picked (when mid-rebase). This means that the commit will be retained upon continuing the rebase. |
-| `` F `` | Create fixup commit | Create 'fixup!' commit for the selected commit. Later on, you can press `S` on this same commit to apply all above fixup commits. |
-| `` S `` | Apply fixup commits | Squash all 'fixup!' commits, either above the selected commit, or all in current branch (autosquash). |
-| `` <c-j> `` | Move commit down one |  |
-| `` <c-k> `` | Move commit up one |  |
-| `` V `` | Paste (cherry-pick) |  |
-| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
-| `` A `` | Amend | Amend commit with staged changes. If the selected commit is the HEAD commit, this will perform `git commit --amend`. Otherwise the commit will be amended via a rebase. |
-| `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
-| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <c-l> `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
-| `` <space> `` | Checkout | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | Open commit in browser |  |
-| `` n `` | Create new branch off of commit |  |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | View files |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Search the current view by text |  |
+## Branches Panel (Sub-commits)
 
-## Confirmation panel
+<pre>
+  <kbd>enter</kbd>: view commit's files
+  <kbd>space</kbd>: checkout commit
+  <kbd>g</kbd>: view reset options
+  <kbd>n</kbd>: new branch
+  <kbd>c</kbd>: copy commit (cherry-pick)
+  <kbd>C</kbd>: copy commit range (cherry-pick)
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Confirm |  |
-| `` <esc> `` | Close/Cancel |  |
+## Branches Panel (Tags Tab)
 
-## Files
+<pre>
+  <kbd>space</kbd>: checkout
+  <kbd>d</kbd>: delete tag
+  <kbd>P</kbd>: push tag
+  <kbd>n</kbd>: create tag
+  <kbd>g</kbd>: view reset options
+  <kbd>enter</kbd>: view commits
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Copy path to clipboard |  |
-| `` <space> `` | Stage | Toggle staged for selected file. |
-| `` <c-b> `` | Filter files by status |  |
-| `` y `` | Copy to clipboard |  |
-| `` c `` | Commit | Commit staged changes. |
-| `` w `` | Commit changes without pre-commit hook |  |
-| `` A `` | Amend last commit |  |
-| `` C `` | Commit changes using git editor |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | Edit | Open file in external editor. |
-| `` o `` | Open file | Open file in default application. |
-| `` i `` | Ignore or exclude file |  |
-| `` r `` | Refresh files |  |
-| `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
-| `` S `` | View stash options | View stash options (e.g. stash all, stash staged, stash unstaged). |
-| `` a `` | Stage all | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage lines / Collapse directory | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
-| `` d `` | Discard | View options for discarding changes to the selected file. |
-| `` g `` | View upstream reset options |  |
-| `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
-| `` ` `` | 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. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` M `` | Open external merge tool | Run `git mergetool`. |
-| `` f `` | Fetch | Fetch changes from remote. |
-| `` / `` | Search the current view by text |  |
+## Commit Files Panel
 
-## Local branches
+<pre>
+  <kbd>ctrl+o</kbd>: copy the committed file name to the clipboard
+  <kbd>c</kbd>: checkout file
+  <kbd>d</kbd>: discard this commit's changes to this file
+  <kbd>o</kbd>: open file
+  <kbd>e</kbd>: edit file
+  <kbd>space</kbd>: toggle file included in patch
+  <kbd>enter</kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
+  <kbd>`</kbd>: toggle file tree view
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Copy branch name to clipboard |  |
-| `` i `` | Show git-flow options |  |
-| `` <space> `` | Checkout | Checkout selected item. |
-| `` n `` | New branch |  |
-| `` o `` | Create pull request |  |
-| `` O `` | View create pull request options |  |
-| `` <c-y> `` | Copy pull request URL to clipboard |  |
-| `` c `` | Checkout by name | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
-| `` F `` | Force checkout | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | Delete | View delete options for local/remote branch. |
-| `` r `` | Rebase | Rebase the checked-out branch onto the selected branch. |
-| `` M `` | Merge | Merge selected branch into currently checked out branch. |
-| `` f `` | Fast-forward | Fast-forward selected branch from its upstream. |
-| `` T `` | New tag |  |
-| `` s `` | Sort order |  |
-| `` g `` | Reset |  |
-| `` R `` | Rename branch |  |
-| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
-| `` <enter> `` | View commits |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
+## Commits Panel (Commits)
 
-## Main panel (merging)
+<pre>
+  <kbd>ctrl+l</kbd>: open log menu
+  <kbd>s</kbd>: squash down
+  <kbd>r</kbd>: reword commit
+  <kbd>R</kbd>: reword commit with editor
+  <kbd>g</kbd>: reset to this commit
+  <kbd>f</kbd>: fixup commit
+  <kbd>F</kbd>: create fixup commit for this commit
+  <kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash)
+  <kbd>d</kbd>: delete commit
+  <kbd>ctrl+j</kbd>: move commit down one
+  <kbd>ctrl+k</kbd>: move commit up one
+  <kbd>e</kbd>: edit commit
+  <kbd>A</kbd>: amend commit with staged changes
+  <kbd>p</kbd>: pick commit (when mid-rebase)
+  <kbd>t</kbd>: revert commit
+  <kbd>c</kbd>: copy commit (cherry-pick)
+  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
+  <kbd>C</kbd>: copy commit range (cherry-pick)
+  <kbd>v</kbd>: paste commits (cherry-pick)
+  <kbd>enter</kbd>: view commit's files
+  <kbd>space</kbd>: checkout commit
+  <kbd>n</kbd>: create new branch off of commit
+  <kbd>T</kbd>: tag commit
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>ctrl+y</kbd>: copy commit message to clipboard
+  <kbd>o</kbd>: open commit in browser
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Pick hunk |  |
-| `` b `` | Pick all hunks |  |
-| `` <up> `` | Previous hunk |  |
-| `` <down> `` | Next hunk |  |
-| `` <left> `` | Previous conflict |  |
-| `` <right> `` | Next conflict |  |
-| `` z `` | Undo | Undo last merge conflict resolution. |
-| `` e `` | Edit file | Open file in external editor. |
-| `` o `` | Open file | Open file in default application. |
-| `` M `` | Open external merge tool | Run `git mergetool`. |
-| `` <esc> `` | Return to files panel |  |
+## Commits Panel (Reflog Tab)
 
-## Main panel (normal)
+<pre>
+  <kbd>enter</kbd>: view commit's files
+  <kbd>space</kbd>: checkout commit
+  <kbd>g</kbd>: view reset options
+  <kbd>c</kbd>: copy commit (cherry-pick)
+  <kbd>C</kbd>: copy commit range (cherry-pick)
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` mouse wheel down (fn+up) `` | Scroll down |  |
-| `` mouse wheel up (fn+down) `` | Scroll up |  |
+## Extras Panel
 
-## Main panel (patch building)
+<pre>
+  <kbd>@</kbd>: open command log menu
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | Go to previous hunk |  |
-| `` <right> `` | Go to next hunk |  |
-| `` v `` | Toggle range select |  |
-| `` a `` | Select hunk | Toggle hunk selection mode. |
-| `` <c-o> `` | Copy selected text to clipboard |  |
-| `` o `` | Open file | Open file in default application. |
-| `` e `` | Edit file | Open file in external editor. |
-| `` <space> `` | Toggle lines in patch |  |
-| `` <esc> `` | Exit custom patch builder |  |
-| `` / `` | Search the current view by text |  |
+## Files Panel
 
-## Main panel (staging)
+<pre>
+  <kbd>ctrl+b</kbd>: Filter commit files
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | Go to previous hunk |  |
-| `` <right> `` | Go to next hunk |  |
-| `` v `` | Toggle range select |  |
-| `` a `` | Select hunk | Toggle hunk selection mode. |
-| `` <c-o> `` | Copy selected text to clipboard |  |
-| `` <space> `` | Stage | Toggle selection staged / unstaged. |
-| `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` o `` | Open file | Open file in default application. |
-| `` e `` | Edit file | Open file in external editor. |
-| `` <esc> `` | Return to files panel |  |
-| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` c `` | Commit | Commit staged changes. |
-| `` w `` | Commit changes without pre-commit hook |  |
-| `` C `` | Commit changes using git editor |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | Search the current view by text |  |
+## Files Panel (Files)
 
-## Menu
+<pre>
+  <kbd>c</kbd>: commit changes
+  <kbd>w</kbd>: commit changes without pre-commit hook
+  <kbd>A</kbd>: amend last commit
+  <kbd>C</kbd>: commit changes using git editor
+  <kbd>space</kbd>: toggle staged
+  <kbd>d</kbd>: view 'discard changes' options
+  <kbd>e</kbd>: edit file
+  <kbd>o</kbd>: open file
+  <kbd>i</kbd>: add to .gitignore
+  <kbd>r</kbd>: refresh files
+  <kbd>s</kbd>: stash changes
+  <kbd>S</kbd>: view stash options
+  <kbd>a</kbd>: stage/unstage all
+  <kbd>D</kbd>: view reset options
+  <kbd>enter</kbd>: stage individual hunks/lines for file, or collapse/expand for directory
+  <kbd>f</kbd>: fetch
+  <kbd>ctrl+o</kbd>: copy the file name to the clipboard
+  <kbd>g</kbd>: view upstream reset options
+  <kbd>`</kbd>: toggle file tree view
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Execute |  |
-| `` <esc> `` | Close |  |
-| `` / `` | Filter the current view by text |  |
+## Files Panel (Submodules)
 
-## Reflog
+<pre>
+  <kbd>ctrl+o</kbd>: copy submodule name to clipboard
+  <kbd>enter</kbd>: enter submodule
+  <kbd>d</kbd>: view reset and remove submodule options
+  <kbd>u</kbd>: update submodule
+  <kbd>n</kbd>: add new submodule
+  <kbd>e</kbd>: update submodule URL
+  <kbd>i</kbd>: initialize submodule
+  <kbd>b</kbd>: view bulk submodule options
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Copy commit hash to clipboard |  |
-| `` <space> `` | Checkout | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | Open commit in browser |  |
-| `` n `` | Create new branch off of commit |  |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | Reset copied (cherry-picked) commits selection |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | View commits |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
+## Main Panel (Merging)
 
-## Remote branches
+<pre>
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>esc</kbd>: return to files panel
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>space</kbd>: pick hunk
+  <kbd>b</kbd>: pick all hunks
+  <kbd>◄</kbd>: select previous conflict
+  <kbd>►</kbd>: select next conflict
+  <kbd>▲</kbd>: select previous hunk
+  <kbd>▼</kbd>: select next hunk
+  <kbd>z</kbd>: undo
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Copy branch name to clipboard |  |
-| `` <space> `` | Checkout | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
-| `` n `` | New branch |  |
-| `` M `` | Merge | Merge selected branch into currently checked out branch. |
-| `` r `` | Rebase | Rebase the checked-out branch onto the selected branch. |
-| `` d `` | Delete | Delete the remote branch from the remote. |
-| `` u `` | Set as upstream | Set the selected remote branch as the upstream of the checked-out branch. |
-| `` s `` | Sort order |  |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | View commits |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
+## Main Panel (Normal)
 
-## Remotes
+<pre>
+  <kbd>Ő</kbd>: scroll down (fn+up)
+  <kbd>ő</kbd>: scroll up (fn+down)
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | View branches |  |
-| `` n `` | New remote |  |
-| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
-| `` e `` | Edit | Edit the selected remote's name or URL. |
-| `` f `` | Fetch | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. |
-| `` / `` | Filter the current view by text |  |
+## Main Panel (Patch Building)
 
-## Stash
+<pre>
+  <kbd>esc</kbd>: exit line-by-line mode
+  <kbd>o</kbd>: open file
+  <kbd>▲</kbd>: select previous line
+  <kbd>▼</kbd>: select next line
+  <kbd>◄</kbd>: select previous hunk
+  <kbd>►</kbd>: select next hunk
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>space</kbd>: add/remove line(s) to patch
+  <kbd>v</kbd>: toggle drag select
+  <kbd>V</kbd>: toggle drag select
+  <kbd>a</kbd>: toggle select hunk
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Apply | Apply the stash entry to your working directory. |
-| `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
-| `` d `` | Drop | Remove the stash entry from the stash list. |
-| `` n `` | New branch | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
-| `` r `` | Rename stash |  |
-| `` <enter> `` | View files |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
+## Main Panel (Staging)
 
-## Status
+<pre>
+  <kbd>esc</kbd>: return to files panel
+  <kbd>space</kbd>: toggle line staged / unstaged
+  <kbd>d</kbd>: delete change (git reset)
+  <kbd>tab</kbd>: switch to other panel
+  <kbd>o</kbd>: open file
+  <kbd>▲</kbd>: select previous line
+  <kbd>▼</kbd>: select next line
+  <kbd>◄</kbd>: select previous hunk
+  <kbd>►</kbd>: select next hunk
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>e</kbd>: edit file
+  <kbd>o</kbd>: open file
+  <kbd>v</kbd>: toggle drag select
+  <kbd>V</kbd>: toggle drag select
+  <kbd>a</kbd>: toggle select hunk
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>c</kbd>: commit changes
+  <kbd>w</kbd>: commit changes without pre-commit hook
+  <kbd>C</kbd>: commit changes using git editor
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` o `` | Open config file | Open file in default application. |
-| `` e `` | Edit config file | Open file in external editor. |
-| `` u `` | Check for update |  |
-| `` <enter> `` | Switch to a recent repo |  |
-| `` a `` | Show all branch logs |  |
+## Menu Panel
 
-## Sub-commits
+<pre>
+  <kbd>esc</kbd>: close menu
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Copy commit hash to clipboard |  |
-| `` <space> `` | Checkout | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | Open commit in browser |  |
-| `` n `` | Create new branch off of commit |  |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | Reset copied (cherry-picked) commits selection |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | View files |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Search the current view by text |  |
+## Stash Panel
 
-## Submodules
+<pre>
+  <kbd>enter</kbd>: view stash entry's files
+  <kbd>space</kbd>: apply
+  <kbd>g</kbd>: pop
+  <kbd>d</kbd>: drop
+  <kbd>n</kbd>: new branch
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Copy submodule name to clipboard |  |
-| `` <enter> `` | Enter | Enter submodule. After entering the submodule, you can press `<esc>` to escape back to the parent repo. |
-| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
-| `` u `` | Update | Update selected submodule. |
-| `` n `` | New submodule |  |
-| `` e `` | Update submodule URL |  |
-| `` i `` | Initialize | Initialize the selected submodule to prepare for fetching. You probably want to follow this up by invoking the 'update' action to fetch the submodule. |
-| `` b `` | View bulk submodule options |  |
-| `` / `` | Filter the current view by text |  |
+## Status Panel
 
-## Tags
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Checkout | Checkout the selected tag tag as a detached HEAD. |
-| `` n `` | New tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` d `` | Delete | View delete options for local/remote tag. |
-| `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | View commits |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## Worktrees
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` n `` | New worktree |  |
-| `` <space> `` | Switch | Switch to the selected worktree. |
-| `` o `` | Open in editor |  |
-| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
-| `` / `` | Filter the current view by text |  |
+<pre>
+  <kbd>e</kbd>: edit config file
+  <kbd>o</kbd>: open config file
+  <kbd>u</kbd>: check for update
+  <kbd>enter</kbd>: switch to a recent repo
+  <kbd>a</kbd>: show all branch logs
+</pre>

docs/keybindings/Keybindings_ja.md

@@ -1,364 +0,0 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
-
-# Lazygit キーバインド
-
-_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
-
-## グローバルキーバインド
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-r> `` | 最近使用したリポジトリに切り替え |  |
-| `` <pgup> (fn+up/shift+k) `` | メインパネルを上にスクロール |  |
-| `` <pgdown> (fn+down/shift+j) `` | メインパネルを下にスクロール |  |
-| `` @ `` | コマンドログメニューを開く | View options for the command log e.g. show/hide the command log and focus the command log. |
-| `` P `` | Push | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view. |
-| `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view. |
-| `` : `` | カスタムコマンドを実行 | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
-| `` <c-p> `` | View custom patch options |  |
-| `` m `` | View merge/rebase options | View options to abort/continue/skip the current merge/rebase. |
-| `` R `` | リフレッシュ | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
-| `` + `` | 次のスクリーンモード (normal/half/fullscreen) |  |
-| `` _ `` | 前のスクリーンモード |  |
-| `` ? `` | メニューを開く |  |
-| `` <c-s> `` | View filter options | View options for filtering the commit log, so that only commits matching the filter are shown. |
-| `` W `` | 差分メニューを開く | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` <c-e> `` | 差分メニューを開く | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` q `` | 終了 |  |
-| `` <esc> `` | キャンセル |  |
-| `` <c-w> `` | 空白文字の差分の表示有無を切り替え | Toggle whether or not whitespace changes are shown in the diff view. |
-| `` z `` | アンドゥ (via reflog) (experimental) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
-| `` <c-z> `` | リドゥ (via reflog) (experimental) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
-
-## 一覧パネルの操作
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` , `` | 前のページ |  |
-| `` . `` | 次のページ |  |
-| `` < `` | 最上部までスクロール |  |
-| `` > `` | 最下部までスクロール |  |
-| `` v `` | 範囲選択を切り替え |  |
-| `` <s-down> `` | Range select down |  |
-| `` <s-up> `` | Range select up |  |
-| `` / `` | 検索を開始 |  |
-| `` H `` | 左スクロール |  |
-| `` L `` | 右スクロール |  |
-| `` ] `` | 次のタブ |  |
-| `` [ `` | 前のタブ |  |
-
-## Stash
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | 適用 | Apply the stash entry to your working directory. |
-| `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
-| `` d `` | Drop | Remove the stash entry from the stash list. |
-| `` n `` | 新しいブランチを作成 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
-| `` r `` | Stashを変更 |  |
-| `` <enter> `` | View files |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## Sub-commits
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | コミットのhashをクリップボードにコピー |  |
-| `` <space> `` | チェックアウト | Checkout the selected commit as a detached HEAD. |
-| `` y `` | コミットの情報をコピー | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | ブラウザでコミットを開く |  |
-| `` n `` | コミットにブランチを作成 |  |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | Reset copied (cherry-picked) commits selection |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | View files |  |
-| `` w `` | View worktree options |  |
-| `` / `` | 検索を開始 |  |
-
-## Worktrees
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` n `` | New worktree |  |
-| `` <space> `` | Switch | Switch to the selected worktree. |
-| `` o `` | Open in editor |  |
-| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
-| `` / `` | Filter the current view by text |  |
-
-## コミット
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | コミットのhashをクリップボードにコピー |  |
-| `` <c-r> `` | Reset copied (cherry-picked) commits selection |  |
-| `` b `` | View bisect options |  |
-| `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
-| `` r `` | コミットメッセージを変更 | Reword the selected commit's message. |
-| `` R `` | エディタでコミットメッセージを編集 |  |
-| `` d `` | コミットを削除 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
-| `` e `` | Edit (start interactive rebase) | コミットを編集 |
-| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
-If you would instead like to start an interactive rebase from the selected commit, press `e`. |
-| `` p `` | Pick | Mark the selected commit to be picked (when mid-rebase). This means that the commit will be retained upon continuing the rebase. |
-| `` F `` | Fixupコミットを作成 | このコミットに対するfixupコミットを作成 |
-| `` S `` | Apply fixup commits | Squash all 'fixup!' commits, either above the selected commit, or all in current branch (autosquash). |
-| `` <c-j> `` | コミットを1つ下に移動 |  |
-| `` <c-k> `` | コミットを1つ上に移動 |  |
-| `` V `` | コミットを貼り付け (cherry-pick) |  |
-| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
-| `` A `` | Amend | ステージされた変更でamendコミット |
-| `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
-| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | タグを作成 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <c-l> `` | ログメニューを開く | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
-| `` <space> `` | チェックアウト | Checkout the selected commit as a detached HEAD. |
-| `` y `` | コミットの情報をコピー | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | ブラウザでコミットを開く |  |
-| `` n `` | コミットにブランチを作成 |  |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | View files |  |
-| `` w `` | View worktree options |  |
-| `` / `` | 検索を開始 |  |
-
-## コミットファイル
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | ファイル名をクリップボードにコピー |  |
-| `` c `` | チェックアウト | Checkout file. This replaces the file in your working tree with the version from the selected commit. |
-| `` d `` | Remove | Discard this commit's changes to this file. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes this file. |
-| `` o `` | ファイルを開く | Open file in default application. |
-| `` e `` | Edit | Open file in external editor. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Enter file / Toggle directory collapsed | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
-| `` ` `` | ファイルツリーの表示を切り替え | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` / `` | 検索を開始 |  |
-
-## コミットメッセージ
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 確認 |  |
-| `` <esc> `` | 閉じる |  |
-
-## サブモジュール
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | サブモジュール名をクリップボードにコピー |  |
-| `` <enter> `` | Enter | サブモジュールを開く |
-| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
-| `` u `` | Update | サブモジュールを更新 |
-| `` n `` | サブモジュールを新規追加 |  |
-| `` e `` | サブモジュールのURLを更新 |  |
-| `` i `` | Initialize | サブモジュールを初期化 |
-| `` b `` | View bulk submodule options |  |
-| `` / `` | Filter the current view by text |  |
-
-## ステータス
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` o `` | 設定ファイルを開く | Open file in default application. |
-| `` e `` | 設定ファイルを編集 | Open file in external editor. |
-| `` u `` | 更新を確認 |  |
-| `` <enter> `` | 最近使用したリポジトリに切り替え |  |
-| `` a `` | すべてのブランチログを表示 |  |
-
-## タグ
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | チェックアウト | Checkout the selected tag tag as a detached HEAD. |
-| `` n `` | タグを作成 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` d `` | Delete | View delete options for local/remote tag. |
-| `` P `` | タグをpush | Push the selected tag to a remote. You'll be prompted to select a remote. |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | コミットを閲覧 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## ファイル
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | ファイル名をクリップボードにコピー |  |
-| `` <space> `` | ステージ/アンステージ | Toggle staged for selected file. |
-| `` <c-b> `` | ファイルをフィルタ (ステージ/アンステージ) |  |
-| `` y `` | Copy to clipboard |  |
-| `` c `` | 変更をコミット | Commit staged changes. |
-| `` w `` | pre-commitフックを実行せずに変更をコミット |  |
-| `` A `` | 最新のコミットにamend |  |
-| `` C `` | gitエディタを使用して変更をコミット |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | Edit | Open file in external editor. |
-| `` o `` | ファイルを開く | Open file in default application. |
-| `` i `` | ファイルをignore |  |
-| `` r `` | ファイルをリフレッシュ |  |
-| `` 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 `` | すべての変更をステージ/アンステージ | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage lines / Collapse directory | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
-| `` d `` | Discard | View options for discarding changes to the selected file. |
-| `` g `` | View upstream reset options |  |
-| `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
-| `` ` `` | ファイルツリーの表示を切り替え | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` M `` | Git mergetoolを開く | Run `git mergetool`. |
-| `` f `` | Fetch | Fetch changes from remote. |
-| `` / `` | 検索を開始 |  |
-
-## ブランチ
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | ブランチ名をクリップボードにコピー |  |
-| `` i `` | Show git-flow options |  |
-| `` <space> `` | チェックアウト | Checkout selected item. |
-| `` n `` | 新しいブランチを作成 |  |
-| `` o `` | Pull Requestを作成 |  |
-| `` O `` | View create pull request options |  |
-| `` <c-y> `` | Pull RequestのURLをクリップボードにコピー |  |
-| `` c `` | Checkout by name | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
-| `` F `` | Force checkout | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | Delete | View delete options for local/remote branch. |
-| `` r `` | Rebase | Rebase the checked-out branch onto the selected branch. |
-| `` M `` | 現在のブランチにマージ | Merge selected branch into currently checked out branch. |
-| `` f `` | Fast-forward | Fast-forward selected branch from its upstream. |
-| `` T `` | タグを作成 |  |
-| `` s `` | 並び替え |  |
-| `` g `` | Reset |  |
-| `` R `` | ブランチ名を変更 |  |
-| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
-| `` <enter> `` | コミットを閲覧 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## メインパネル (Merging)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Pick hunk |  |
-| `` b `` | Pick all hunks |  |
-| `` <up> `` | 前のhunkを選択 |  |
-| `` <down> `` | 次のhunkを選択 |  |
-| `` <left> `` | 前のコンフリクトを選択 |  |
-| `` <right> `` | 次のコンフリクトを選択 |  |
-| `` z `` | アンドゥ | Undo last merge conflict resolution. |
-| `` e `` | ファイルを編集 | Open file in external editor. |
-| `` o `` | ファイルを開く | Open file in default application. |
-| `` M `` | Git mergetoolを開く | Run `git mergetool`. |
-| `` <esc> `` | ファイル一覧に戻る |  |
-
-## メインパネル (Normal)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` mouse wheel down (fn+up) `` | 下にスクロール |  |
-| `` mouse wheel up (fn+down) `` | 上にスクロール |  |
-
-## メインパネル (Patch Building)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | 前のhunkを選択 |  |
-| `` <right> `` | 次のhunkを選択 |  |
-| `` v `` | 範囲選択を切り替え |  |
-| `` a `` | Hunk選択を切り替え | Toggle hunk selection mode. |
-| `` <c-o> `` | 選択されたテキストをクリップボードにコピー |  |
-| `` o `` | ファイルを開く | Open file in default application. |
-| `` e `` | ファイルを編集 | Open file in external editor. |
-| `` <space> `` | 行をパッチに追加/削除 |  |
-| `` <esc> `` | Exit custom patch builder |  |
-| `` / `` | 検索を開始 |  |
-
-## メインパネル (Staging)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | 前のhunkを選択 |  |
-| `` <right> `` | 次のhunkを選択 |  |
-| `` v `` | 範囲選択を切り替え |  |
-| `` a `` | Hunk選択を切り替え | Toggle hunk selection mode. |
-| `` <c-o> `` | 選択されたテキストをクリップボードにコピー |  |
-| `` <space> `` | ステージ/アンステージ | 選択行をステージ/アンステージ |
-| `` d `` | 変更を削除 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` o `` | ファイルを開く | Open file in default application. |
-| `` e `` | ファイルを編集 | Open file in external editor. |
-| `` <esc> `` | ファイル一覧に戻る |  |
-| `` <tab> `` | パネルを切り替え | Switch to other view (staged/unstaged changes). |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` c `` | 変更をコミット | Commit staged changes. |
-| `` w `` | pre-commitフックを実行せずに変更をコミット |  |
-| `` C `` | gitエディタを使用して変更をコミット |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | 検索を開始 |  |
-
-## メニュー
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 実行 |  |
-| `` <esc> `` | 閉じる |  |
-| `` / `` | Filter the current view by text |  |
-
-## リモート
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | View branches |  |
-| `` n `` | リモートを新規追加 |  |
-| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
-| `` e `` | Edit | リモートを編集 |
-| `` f `` | Fetch | リモートをfetch |
-| `` / `` | Filter the current view by text |  |
-
-## リモートブランチ
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | ブランチ名をクリップボードにコピー |  |
-| `` <space> `` | チェックアウト | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
-| `` n `` | 新しいブランチを作成 |  |
-| `` M `` | 現在のブランチにマージ | Merge selected branch into currently checked out branch. |
-| `` r `` | Rebase | Rebase the checked-out branch onto the selected branch. |
-| `` d `` | Delete | Delete the remote branch from the remote. |
-| `` u `` | Set as upstream | Set the selected remote branch as the upstream of the checked-out branch. |
-| `` s `` | 並び替え |  |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | コミットを閲覧 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## 参照ログ
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | コミットのhashをクリップボードにコピー |  |
-| `` <space> `` | チェックアウト | Checkout the selected commit as a detached HEAD. |
-| `` y `` | コミットの情報をコピー | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | ブラウザでコミットを開く |  |
-| `` n `` | コミットにブランチを作成 |  |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | Reset copied (cherry-picked) commits selection |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | コミットを閲覧 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## 確認パネル
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 確認 |  |
-| `` <esc> `` | 閉じる/キャンセル |  |

docs/keybindings/Keybindings_ko.md

@@ -1,364 +0,0 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
-
-# Lazygit 키 바인딩
-
-_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
-
-## 글로벌 키 바인딩
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-r> `` | 최근에 사용한 저장소로 전환 |  |
-| `` <pgup> (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 |  |
-| `` <pgdown> (fn+down/shift+j) `` | 메인 패널을 아래로로 스크롤 |  |
-| `` @ `` | 명령어 로그 메뉴 열기 | View options for the command log e.g. show/hide the command log and focus the command log. |
-| `` P `` | 푸시 | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` p `` | 업데이트 | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` } `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 | Increase the amount of the context shown around changes in the diff view. |
-| `` { `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 | Decrease the amount of the context shown around changes in the diff view. |
-| `` : `` | Execute custom command | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
-| `` <c-p> `` | 커스텀 Patch 옵션 보기 |  |
-| `` m `` | View merge/rebase options | View options to abort/continue/skip the current merge/rebase. |
-| `` R `` | 새로고침 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
-| `` + `` | 다음 스크린 모드 (normal/half/fullscreen) |  |
-| `` _ `` | 이전 스크린 모드 |  |
-| `` ? `` | 매뉴 열기 |  |
-| `` <c-s> `` | View filter-by-path options | View options for filtering the commit log, so that only commits matching the filter are shown. |
-| `` W `` | Diff 메뉴 열기 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` <c-e> `` | Diff 메뉴 열기 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` q `` | 종료 |  |
-| `` <esc> `` | 취소 |  |
-| `` <c-w> `` | 공백문자를 Diff 뷰에서 표시 여부 전환 | Toggle whether or not whitespace changes are shown in the diff view. |
-| `` z `` | 되돌리기 (reflog) (실험적) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
-| `` <c-z> `` | 다시 실행 (reflog) (실험적) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
-
-## List panel navigation
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` , `` | 이전 페이지 |  |
-| `` . `` | 다음 페이지 |  |
-| `` < `` | 맨 위로 스크롤  |  |
-| `` > `` | 맨 아래로 스크롤  |  |
-| `` v `` | 드래그 선택 전환 |  |
-| `` <s-down> `` | Range select down |  |
-| `` <s-up> `` | Range select up |  |
-| `` / `` | 검색 시작 |  |
-| `` H `` | 우 스크롤 |  |
-| `` L `` | 좌 스크롤 |  |
-| `` ] `` | 이전 탭 |  |
-| `` [ `` | 다음 탭 |  |
-
-## Reflog
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 커밋 해시를 클립보드에 복사 |  |
-| `` <space> `` | 체크아웃 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | 브라우저에서 커밋 열기 |  |
-| `` n `` | 커밋에서 새 브랜치를 만듭니다. |  |
-| `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | Reset cherry-picked (copied) commits selection |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | 커밋 보기 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## Stash
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | 적용 | Apply the stash entry to your working directory. |
-| `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
-| `` d `` | Drop | Remove the stash entry from the stash list. |
-| `` n `` | 새 브랜치 생성 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
-| `` r `` | Rename stash |  |
-| `` <enter> `` | View selected item's files |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## Sub-commits
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 커밋 해시를 클립보드에 복사 |  |
-| `` <space> `` | 체크아웃 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | 브라우저에서 커밋 열기 |  |
-| `` n `` | 커밋에서 새 브랜치를 만듭니다. |  |
-| `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | Reset cherry-picked (copied) commits selection |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | View selected item's files |  |
-| `` w `` | View worktree options |  |
-| `` / `` | 검색 시작 |  |
-
-## Worktrees
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` n `` | New worktree |  |
-| `` <space> `` | Switch | Switch to the selected worktree. |
-| `` o `` | Open in editor |  |
-| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
-| `` / `` | Filter the current view by text |  |
-
-## 메뉴
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 실행 |  |
-| `` <esc> `` | 닫기 |  |
-| `` / `` | Filter the current view by text |  |
-
-## 메인 패널 (Merging)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Pick hunk |  |
-| `` b `` | Pick all hunks |  |
-| `` <up> `` | 이전 hunk를 선택 |  |
-| `` <down> `` | 다음 hunk를 선택 |  |
-| `` <left> `` | 이전 충돌을 선택 |  |
-| `` <right> `` | 다음 충돌을 선택 |  |
-| `` z `` | 되돌리기 | Undo last merge conflict resolution. |
-| `` e `` | 파일 편집 | Open file in external editor. |
-| `` o `` | 파일 닫기 | Open file in default application. |
-| `` M `` | Git mergetool를 열기 | Run `git mergetool`. |
-| `` <esc> `` | 파일 목록으로 돌아가기 |  |
-
-## 메인 패널 (Normal)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` mouse wheel down (fn+up) `` | 아래로 스크롤 |  |
-| `` mouse wheel up (fn+down) `` | 위로 스크롤 |  |
-
-## 메인 패널 (Patch Building)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | 이전 hunk를 선택 |  |
-| `` <right> `` | 다음 hunk를 선택 |  |
-| `` v `` | 드래그 선택 전환 |  |
-| `` a `` | Toggle select hunk | Toggle hunk selection mode. |
-| `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 |  |
-| `` o `` | 파일 닫기 | Open file in default application. |
-| `` e `` | 파일 편집 | Open file in external editor. |
-| `` <space> `` | Line(s)을 패치에 추가/삭제 |  |
-| `` <esc> `` | Exit custom patch builder |  |
-| `` / `` | 검색 시작 |  |
-
-## 메인 패널 (Staging)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | 이전 hunk를 선택 |  |
-| `` <right> `` | 다음 hunk를 선택 |  |
-| `` v `` | 드래그 선택 전환 |  |
-| `` a `` | Toggle select hunk | Toggle hunk selection mode. |
-| `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 |  |
-| `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
-| `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` o `` | 파일 닫기 | Open file in default application. |
-| `` e `` | 파일 편집 | Open file in external editor. |
-| `` <esc> `` | 파일 목록으로 돌아가기 |  |
-| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` c `` | 커밋 변경내용 | Commit staged changes. |
-| `` w `` | Commit changes without pre-commit hook |  |
-| `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | 검색 시작 |  |
-
-## 브랜치
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 브랜치명을 클립보드에 복사 |  |
-| `` i `` | Git-flow 옵션 보기 |  |
-| `` <space> `` | 체크아웃 | Checkout selected item. |
-| `` n `` | 새 브랜치 생성 |  |
-| `` o `` | 풀 리퀘스트 생성 |  |
-| `` O `` | 풀 리퀘스트 생성 옵션 |  |
-| `` <c-y> `` | 풀 리퀘스트 URL을 클립보드에 복사 |  |
-| `` c `` | 이름으로 체크아웃 | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
-| `` F `` | 강제 체크아웃 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | Delete | View delete options for local/remote branch. |
-| `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | Rebase the checked-out branch onto the selected branch. |
-| `` M `` | 현재 브랜치에 병합 | Merge selected branch into currently checked out branch. |
-| `` f `` | Fast-forward this branch from its upstream | Fast-forward selected branch from its upstream. |
-| `` T `` | 태그를 생성 |  |
-| `` s `` | Sort order |  |
-| `` g `` | View reset options |  |
-| `` R `` | 브랜치 이름 변경 |  |
-| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
-| `` <enter> `` | 커밋 보기 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## 상태
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` o `` | 설정 파일 열기 | Open file in default application. |
-| `` e `` | 설정 파일 수정 | Open file in external editor. |
-| `` u `` | 업데이트 확인 |  |
-| `` <enter> `` | 최근에 사용한 저장소로 전환 |  |
-| `` a `` | 모든 브랜치 로그 표시 |  |
-
-## 서브모듈
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 서브모듈 이름을 클립보드에 복사 |  |
-| `` <enter> `` | Enter | 서브모듈 열기 |
-| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
-| `` u `` | Update | 서브모듈 업데이트 |
-| `` n `` | 새로운 서브모듈 추가 |  |
-| `` e `` | 서브모듈의 URL을 수정 |  |
-| `` i `` | Initialize | 서브모듈 초기화 |
-| `` b `` | View bulk submodule options |  |
-| `` / `` | Filter the current view by text |  |
-
-## 원격
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | View branches |  |
-| `` n `` | 새로운 Remote 추가 |  |
-| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
-| `` e `` | Edit | Remote를 수정 |
-| `` f `` | Fetch | 원격을 업데이트 |
-| `` / `` | Filter the current view by text |  |
-
-## 원격 브랜치
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 브랜치명을 클립보드에 복사 |  |
-| `` <space> `` | 체크아웃 | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
-| `` n `` | 새 브랜치 생성 |  |
-| `` M `` | 현재 브랜치에 병합 | Merge selected branch into currently checked out branch. |
-| `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | Rebase the checked-out branch onto the selected branch. |
-| `` d `` | Delete | Delete the remote branch from the remote. |
-| `` u `` | Set as upstream | Set the selected remote branch as the upstream of the checked-out branch. |
-| `` s `` | Sort order |  |
-| `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | 커밋 보기 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## 커밋
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 커밋 해시를 클립보드에 복사 |  |
-| `` <c-r> `` | Reset cherry-picked (copied) commits selection |  |
-| `` b `` | Bisect 옵션 보기 |  |
-| `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
-| `` r `` | 커밋메시지 변경 | Reword the selected commit's message. |
-| `` R `` | 에디터에서 커밋메시지 수정 |  |
-| `` d `` | 커밋 삭제 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
-| `` e `` | Edit (start interactive rebase) | 커밋을 편집 |
-| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
-If you would instead like to start an interactive rebase from the selected commit, press `e`. |
-| `` p `` | Pick | Pick commit (when mid-rebase) |
-| `` F `` | Create fixup commit | Create fixup commit for this commit |
-| `` S `` | Apply fixup commits | Squash all 'fixup!' commits above selected commit (autosquash) |
-| `` <c-j> `` | 커밋을 1개 아래로 이동 |  |
-| `` <c-k> `` | 커밋을 1개 위로 이동 |  |
-| `` V `` | 커밋을 붙여넣기 (cherry-pick) |  |
-| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
-| `` A `` | Amend | Amend commit with staged changes |
-| `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
-| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <c-l> `` | 로그 메뉴 열기 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
-| `` <space> `` | 체크아웃 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | 브라우저에서 커밋 열기 |  |
-| `` n `` | 커밋에서 새 브랜치를 만듭니다. |  |
-| `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | View selected item's files |  |
-| `` w `` | View worktree options |  |
-| `` / `` | 검색 시작 |  |
-
-## 커밋 파일
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 파일명을 클립보드에 복사 |  |
-| `` c `` | 체크아웃 | Checkout file |
-| `` d `` | Remove | Discard this commit's changes to this file |
-| `` o `` | 파일 닫기 | Open file in default application. |
-| `` e `` | Edit | Open file in external editor. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` a `` | Toggle all files included in patch | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
-| `` ` `` | 파일 트리뷰로 전환 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` / `` | 검색 시작 |  |
-
-## 커밋메시지
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 확인 |  |
-| `` <esc> `` | 닫기 |  |
-
-## 태그
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | 체크아웃 | Checkout the selected tag tag as a detached HEAD. |
-| `` n `` | 태그를 생성 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` d `` | Delete | View delete options for local/remote tag. |
-| `` P `` | 태그를 push | Push the selected tag to a remote. You'll be prompted to select a remote. |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | 커밋 보기 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## 파일
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 파일명을 클립보드에 복사 |  |
-| `` <space> `` | Staged 전환 | Toggle staged for selected file. |
-| `` <c-b> `` | 파일을 필터하기 (Staged/unstaged) |  |
-| `` y `` | Copy to clipboard |  |
-| `` c `` | 커밋 변경내용 | Commit staged changes. |
-| `` w `` | Commit changes without pre-commit hook |  |
-| `` A `` | 마지맛 커밋 수정 |  |
-| `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | Edit | Open file in external editor. |
-| `` o `` | 파일 닫기 | Open file in default application. |
-| `` i `` | Ignore file |  |
-| `` r `` | 파일 새로고침 |  |
-| `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
-| `` S `` | Stash 옵션 보기 | View stash options (e.g. stash all, stash staged, stash unstaged). |
-| `` a `` | 모든 변경을 Staged/unstaged으로 전환 | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
-| `` d `` | View 'discard changes' options | View options for discarding changes to the selected file. |
-| `` g `` | View upstream reset options |  |
-| `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
-| `` ` `` | 파일 트리뷰로 전환 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` M `` | Git mergetool를 열기 | Run `git mergetool`. |
-| `` f `` | Fetch | Fetch changes from remote. |
-| `` / `` | 검색 시작 |  |
-
-## 확인 패널
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 확인 |  |
-| `` <esc> `` | 닫기/취소 |  |

docs/keybindings/Keybindings_nl.md

@@ -1,364 +1,307 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+# This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root.
 
 # Lazygit Sneltoetsen
 
-_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
+## Globale Sneltoetsen
 
-## Globale sneltoetsen
+<pre>
+  <kbd>ctrl+r</kbd>: wissel naar een recente repo (<c-r>)
+  <kbd>pgup</kbd>: scroll naar beneden vanaf hoofdpaneel (fn+up)
+  <kbd>pgdown</kbd>: scroll naar beneden vanaf hoofdpaneel (fn+down)
+  <kbd>m</kbd>: bekijk merge/rebase opties
+  <kbd>ctrl+p</kbd>: bekijk aangepaste patch opties
+  <kbd>P</kbd>: push
+  <kbd>p</kbd>: pull
+  <kbd>R</kbd>: verversen
+  <kbd>x</kbd>: open menu
+  <kbd>z</kbd>: ongedaan maken (via reflog) (experimenteel)
+  <kbd>ctrl+z</kbd>: redo (via reflog) (experimenteel)
+  <kbd>+</kbd>: volgende scherm modus (normaal/half/groot)
+  <kbd>_</kbd>: vorige scherm modus
+  <kbd>:</kbd>: voor aangepaste commando uit
+  <kbd>ctrl+s</kbd>: bekijk scoping opties
+  <kbd>W</kbd>: open diff menu
+  <kbd>ctrl+e</kbd>: open diff menu
+  <kbd>@</kbd>: open command log menu
+  <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
+  <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-r> `` | Wissel naar een recente repo |  |
-| `` <pgup> (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel |  |
-| `` <pgdown> (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel |  |
-| `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
-| `` P `` | Push | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view. |
-| `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view. |
-| `` : `` | Voer aangepaste commando uit | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
-| `` <c-p> `` | Bekijk aangepaste patch opties |  |
-| `` m `` | Bekijk merge/rebase opties | View options to abort/continue/skip the current merge/rebase. |
-| `` R `` | Verversen | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
-| `` + `` | Volgende scherm modus (normaal/half/groot) |  |
-| `` _ `` | Vorige scherm modus |  |
-| `` ? `` | Open menu |  |
-| `` <c-s> `` | Bekijk scoping opties | View options for filtering the commit log, so that only commits matching the filter are shown. |
-| `` W `` | Open diff menu | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` <c-e> `` | Open diff menu | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` q `` | Quit |  |
-| `` <esc> `` | Annuleren |  |
-| `` <c-w> `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view. |
-| `` z `` | Ongedaan maken (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
-| `` <c-z> `` | Redo (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
+## Lijstpaneel Navigatie
 
-## Lijstpaneel navigatie
+<pre>
+  <kbd>.</kbd>: volgende pagina
+  <kbd>,</kbd>: vorige pagina
+  <kbd><</kbd>: scroll naar boven
+  <kbd>></kbd>: scroll naar beneden
+  <kbd>/</kbd>: start met zoeken
+  <kbd>]</kbd>: volgende tabblad
+  <kbd>[</kbd>: vorige tabblad
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` , `` | Vorige pagina |  |
-| `` . `` | Volgende pagina |  |
-| `` < `` | Scroll naar boven |  |
-| `` > `` | Scroll naar beneden |  |
-| `` v `` | Toggle drag selecteer |  |
-| `` <s-down> `` | Range select down |  |
-| `` <s-up> `` | Range select up |  |
-| `` / `` | Start met zoeken |  |
-| `` H `` | Scroll left |  |
-| `` L `` | Scroll right |  |
-| `` ] `` | Volgende tabblad |  |
-| `` [ `` | Vorige tabblad |  |
+## Branches Paneel (Branches Tabblad)
 
-## Bestanden
+<pre>
+  <kbd>space</kbd>: uitchecken
+  <kbd>o</kbd>: maak een pull-request
+  <kbd>O</kbd>: bekijk opties voor pull-aanvraag
+  <kbd>ctrl+y</kbd>: kopieer de URL van het pull-verzoek naar het klembord
+  <kbd>c</kbd>: uitchecken bij naam
+  <kbd>F</kbd>: forceer checkout
+  <kbd>n</kbd>: nieuwe branch
+  <kbd>d</kbd>: verwijder branch
+  <kbd>r</kbd>: rebase branch
+  <kbd>M</kbd>: merge in met huidige checked out branch
+  <kbd>i</kbd>: laat git-flow opties zien
+  <kbd>f</kbd>: fast-forward deze branch vanaf zijn upstream
+  <kbd>g</kbd>: bekijk reset opties
+  <kbd>R</kbd>: hernoem branch
+  <kbd>ctrl+o</kbd>: kopieer branch name naar klembord
+  <kbd>enter</kbd>: bekijk commits
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopieer de bestandsnaam naar het klembord |  |
-| `` <space> `` | Toggle staged | Toggle staged for selected file. |
-| `` <c-b> `` | Filter files by status |  |
-| `` y `` | Copy to clipboard |  |
-| `` c `` | Commit veranderingen | Commit staged changes. |
-| `` w `` | Commit veranderingen zonder pre-commit hook |  |
-| `` A `` | Wijzig laatste commit |  |
-| `` C `` | Commit veranderingen met de git editor |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | Edit | Open file in external editor. |
-| `` o `` | Open bestand | Open file in default application. |
-| `` i `` | Ignore or exclude file |  |
-| `` r `` | Refresh bestanden |  |
-| `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
-| `` S `` | Bekijk stash opties | View stash options (e.g. stash all, stash staged, stash unstaged). |
-| `` a `` | Toggle staged alle | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage individuele hunks/lijnen | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
-| `` d `` | Bekijk 'veranderingen ongedaan maken' opties | View options for discarding changes to the selected file. |
-| `` g `` | Bekijk upstream reset opties |  |
-| `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
-| `` ` `` | 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. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` M `` | Open external merge tool | Run `git mergetool`. |
-| `` f `` | Fetch | Fetch changes from remote. |
-| `` / `` | Start met zoeken |  |
+## Branches Paneel (Remote Branches (in Remotes tabblad))
 
-## Bevestigingspaneel
+<pre>
+  <kbd>esc</kbd>: Ga terug naar remotes lijst
+  <kbd>g</kbd>: bekijk reset opties
+  <kbd>enter</kbd>: bekijk commits
+  <kbd>space</kbd>: uitchecken
+  <kbd>n</kbd>: nieuwe branch
+  <kbd>M</kbd>: merge in met huidige checked out branch
+  <kbd>d</kbd>: verwijder branch
+  <kbd>r</kbd>: rebase branch
+  <kbd>u</kbd>: stel in als upstream van uitgecheckte branch
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Bevestig |  |
-| `` <esc> `` | Sluiten |  |
+## Branches Paneel (Remotes Tabblad)
 
-## Branches
+<pre>
+  <kbd>f</kbd>: fetch remote
+  <kbd>n</kbd>: voeg een nieuwe remote toe
+  <kbd>d</kbd>: verwijder remote
+  <kbd>e</kbd>: wijzig remote
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopieer branch name naar klembord |  |
-| `` i `` | Laat git-flow opties zien |  |
-| `` <space> `` | Uitchecken | Checkout selected item. |
-| `` n `` | Nieuwe branch |  |
-| `` o `` | Maak een pull-request |  |
-| `` O `` | Bekijk opties voor pull-aanvraag |  |
-| `` <c-y> `` | Kopieer de URL van het pull-verzoek naar het klembord |  |
-| `` c `` | Uitchecken bij naam | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
-| `` F `` | Forceer checkout | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | Delete | View delete options for local/remote branch. |
-| `` r `` | Rebase branch | Rebase the checked-out branch onto the selected branch. |
-| `` M `` | Merge in met huidige checked out branch | Merge selected branch into currently checked out branch. |
-| `` f `` | Fast-forward deze branch vanaf zijn upstream | Fast-forward selected branch from its upstream. |
-| `` T `` | Creëer tag |  |
-| `` s `` | Sort order |  |
-| `` g `` | Bekijk reset opties |  |
-| `` R `` | Hernoem branch |  |
-| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
-| `` <enter> `` | Bekijk commits |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
+## Branches Paneel (Sub-commits)
 
-## Commit bericht
+<pre>
+  <kbd>enter</kbd>: bekijk gecommite bestanden
+  <kbd>space</kbd>: checkout commit
+  <kbd>g</kbd>: bekijk reset opties
+  <kbd>n</kbd>: nieuwe branch
+  <kbd>c</kbd>: kopieer commit (cherry-pick)
+  <kbd>C</kbd>: kopieer commit reeks (cherry-pick)
+  <kbd>ctrl+r</kbd>: reset cherry-picked (gekopieerde) commits selectie
+  <kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Bevestig |  |
-| `` <esc> `` | Sluiten |  |
+## Branches Paneel (Tags Tabblad)
 
-## Commit bestanden
+<pre>
+  <kbd>space</kbd>: uitchecken
+  <kbd>d</kbd>: verwijder tag
+  <kbd>P</kbd>: push tag
+  <kbd>n</kbd>: creëer tag
+  <kbd>g</kbd>: bekijk reset opties
+  <kbd>enter</kbd>: bekijk commits
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopieer de bestandsnaam naar het klembord |  |
-| `` c `` | Uitchecken | Bestand uitchecken |
-| `` d `` | Remove | Uitsluit deze commit zijn veranderingen aan dit bestand |
-| `` o `` | Open bestand | Open file in default application. |
-| `` e `` | Edit | Open file in external editor. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <space> `` | Toggle bestand inbegrepen in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Enter bestand om geselecteerde regels toe te voegen aan de patch | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
-| `` ` `` | Toggle bestandsboom weergave | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` / `` | Start met zoeken |  |
+## Commit bestanden Paneel
 
-## Commits
+<pre>
+  <kbd>ctrl+o</kbd>: kopieer de vastgelegde bestandsnaam naar het klembord
+  <kbd>c</kbd>: bestand uitchecken
+  <kbd>d</kbd>: uitsluit deze commit zijn veranderingen aan dit bestand
+  <kbd>o</kbd>: open bestand
+  <kbd>e</kbd>: verander bestand
+  <kbd>space</kbd>: toggle bestand inbegrepen in patch
+  <kbd>enter</kbd>: enter bestand om geselecteerde regels toe te voegen aan de patch
+  <kbd>`</kbd>: toggle bestandsboom weergave
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopieer commit hash naar klembord |  |
-| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie |  |
-| `` b `` | View bisect options |  |
-| `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
-| `` r `` | Hernoem commit | Reword the selected commit's message. |
-| `` R `` | Hernoem commit met editor |  |
-| `` d `` | Verwijder commit | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
-| `` e `` | Edit (start interactive rebase) | Wijzig commit |
-| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
-If you would instead like to start an interactive rebase from the selected commit, press `e`. |
-| `` p `` | Pick | Kies commit (wanneer midden in rebase) |
-| `` F `` | Creëer fixup commit | Creëer fixup commit |
-| `` S `` | Apply fixup commits | Squash bovenstaande commits |
-| `` <c-j> `` | Verplaats commit 1 naar beneden |  |
-| `` <c-k> `` | Verplaats commit 1 naar boven |  |
-| `` V `` | Plak commits (cherry-pick) |  |
-| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
-| `` A `` | Amend | Wijzig commit met staged veranderingen |
-| `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
-| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <c-l> `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
-| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | Open commit in browser |  |
-| `` n `` | Creëer nieuwe branch van commit |  |
-| `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | Bekijk gecommite bestanden |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Start met zoeken |  |
+## Commits Paneel (Commits)
 
-## Menu
+<pre>
+  <kbd>ctrl+l</kbd>: open log menu
+  <kbd>s</kbd>: squash beneden
+  <kbd>r</kbd>: hernoem commit
+  <kbd>R</kbd>: hernoem commit met editor
+  <kbd>g</kbd>: reset naar deze commit
+  <kbd>f</kbd>: Fixup commit
+  <kbd>F</kbd>: creëer fixup commit voor deze commit
+  <kbd>S</kbd>: squash bovenstaande commits
+  <kbd>d</kbd>: verwijder commit
+  <kbd>ctrl+j</kbd>: verplaats commit 1 naar beneden
+  <kbd>ctrl+k</kbd>: verplaats commit 1 naar boven
+  <kbd>e</kbd>: wijzig commit
+  <kbd>A</kbd>: wijzig commit met staged veranderingen
+  <kbd>p</kbd>: kies commit (wanneer midden in rebase)
+  <kbd>t</kbd>: commit ongedaan maken
+  <kbd>c</kbd>: kopieer commit (cherry-pick)
+  <kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord
+  <kbd>C</kbd>: kopieer commit reeks (cherry-pick)
+  <kbd>v</kbd>: plak commits (cherry-pick)
+  <kbd>enter</kbd>: bekijk gecommite bestanden
+  <kbd>space</kbd>: checkout commit
+  <kbd>n</kbd>: creëer nieuwe branch van commit
+  <kbd>T</kbd>: tag commit
+  <kbd>ctrl+r</kbd>: reset cherry-picked (gekopieerde) commits selectie
+  <kbd>ctrl+y</kbd>: kopieer commit bericht naar klembord
+  <kbd>o</kbd>: open commit in browser
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Uitvoeren |  |
-| `` <esc> `` | Sluiten |  |
-| `` / `` | Filter the current view by text |  |
+## Commits Paneel (Reflog Tabblad)
 
-## Mergen
+<pre>
+  <kbd>enter</kbd>: bekijk gecommite bestanden
+  <kbd>space</kbd>: checkout commit
+  <kbd>g</kbd>: bekijk reset opties
+  <kbd>c</kbd>: kopieer commit (cherry-pick)
+  <kbd>C</kbd>: kopieer commit reeks (cherry-pick)
+  <kbd>ctrl+r</kbd>: reset cherry-picked (gekopieerde) commits selectie
+  <kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Kies stuk |  |
-| `` b `` | Kies beide stukken |  |
-| `` <up> `` | Selecteer bovenste hunk |  |
-| `` <down> `` | Selecteer onderste hunk |  |
-| `` <left> `` | Selecteer voorgaand conflict |  |
-| `` <right> `` | Selecteer volgende conflict |  |
-| `` z `` | Ongedaan maken | Undo last merge conflict resolution. |
-| `` e `` | Verander bestand | Open file in external editor. |
-| `` o `` | Open bestand | Open file in default application. |
-| `` M `` | Open external merge tool | Run `git mergetool`. |
-| `` <esc> `` | Ga terug naar het bestanden paneel |  |
+## Extras Paneel
 
-## Normaal
+<pre>
+  <kbd>@</kbd>: open command log menu
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` mouse wheel down (fn+up) `` | Scroll omlaag |  |
-| `` mouse wheel up (fn+down) `` | Scroll omhoog |  |
+## Bestanden Paneel
 
-## Patch bouwen
+<pre>
+  <kbd>ctrl+b</kbd>: Commit dossiers filteren
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | Selecteer de vorige hunk |  |
-| `` <right> `` | Selecteer de volgende hunk |  |
-| `` v `` | Toggle drag selecteer |  |
-| `` a `` | Toggle selecteer hunk | Toggle hunk selection mode. |
-| `` <c-o> `` | Copy selected text to clipboard |  |
-| `` o `` | Open bestand | Open file in default application. |
-| `` e `` | Verander bestand | Open file in external editor. |
-| `` <space> `` | Voeg toe/verwijder lijn(en) in patch |  |
-| `` <esc> `` | Sluit lijn-bij-lijn modus |  |
-| `` / `` | Start met zoeken |  |
+## Bestanden Paneel (Bestanden)
 
-## Reflog
+<pre>
+  <kbd>c</kbd>: Commit veranderingen
+  <kbd>w</kbd>: commit veranderingen zonder pre-commit hook
+  <kbd>A</kbd>: wijzig laatste commit
+  <kbd>C</kbd>: commit veranderingen met de git editor
+  <kbd>space</kbd>: toggle staged
+  <kbd>d</kbd>: bekijk 'veranderingen ongedaan maken' opties
+  <kbd>e</kbd>: verander bestand
+  <kbd>o</kbd>: open bestand
+  <kbd>i</kbd>: voeg toe aan .gitignore
+  <kbd>r</kbd>: refresh bestanden
+  <kbd>s</kbd>: stash-bestanden
+  <kbd>S</kbd>: bekijk stash opties
+  <kbd>a</kbd>: toggle staged alle
+  <kbd>D</kbd>: bekijk reset opties
+  <kbd>enter</kbd>: stage individuele hunks/lijnen
+  <kbd>f</kbd>: fetch
+  <kbd>ctrl+o</kbd>: kopieer de bestandsnaam naar het klembord
+  <kbd>g</kbd>: bekijk upstream reset opties
+  <kbd>`</kbd>: toggle bestandsboom weergave
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopieer commit hash naar klembord |  |
-| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | Open commit in browser |  |
-| `` n `` | Creëer nieuwe branch van commit |  |
-| `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | Bekijk commits |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
+## Bestanden Paneel (Submodules)
 
-## Remote branches
+<pre>
+  <kbd>ctrl+o</kbd>: kopieer submodule naam naar klembord
+  <kbd>enter</kbd>: enter submodule
+  <kbd>d</kbd>: bekijk reset en verwijder submodule opties
+  <kbd>u</kbd>: update submodule
+  <kbd>n</kbd>: voeg nieuwe submodule toe
+  <kbd>e</kbd>: update submodule URL
+  <kbd>i</kbd>: initialiseer submodule
+  <kbd>b</kbd>: bekijk bulk submodule opties
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopieer branch name naar klembord |  |
-| `` <space> `` | Uitchecken | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
-| `` n `` | Nieuwe branch |  |
-| `` M `` | Merge in met huidige checked out branch | Merge selected branch into currently checked out branch. |
-| `` r `` | Rebase branch | Rebase the checked-out branch onto the selected branch. |
-| `` d `` | Delete | Delete the remote branch from the remote. |
-| `` u `` | Set as upstream | Stel in als upstream van uitgecheckte branch |
-| `` s `` | Sort order |  |
-| `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | Bekijk commits |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
+## Hoofd Paneel (Mergen)
 
-## Remotes
+<pre>
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>esc</kbd>: ga terug naar het bestanden paneel
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>space</kbd>: kies hunk
+  <kbd>b</kbd>: kies bijde hunks
+  <kbd>◄</kbd>: selecteer voorgaand conflict
+  <kbd>►</kbd>: selecteer volgende conflict
+  <kbd>▲</kbd>: selecteer bovenste hunk
+  <kbd>▼</kbd>: selecteer onderste hunk
+  <kbd>z</kbd>: ongedaan maken
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | View branches |  |
-| `` n `` | Voeg een nieuwe remote toe |  |
-| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
-| `` e `` | Edit | Wijzig remote |
-| `` f `` | Fetch | Fetch remote |
-| `` / `` | Filter the current view by text |  |
+## Hoofd Paneel (Normaal)
 
-## Staging
+<pre>
+  <kbd>Ő</kbd>: scroll omlaag (fn+up)
+  <kbd>ő</kbd>: scroll omhoog (fn+down)
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | Selecteer de vorige hunk |  |
-| `` <right> `` | Selecteer de volgende hunk |  |
-| `` v `` | Toggle drag selecteer |  |
-| `` a `` | Toggle selecteer hunk | Toggle hunk selection mode. |
-| `` <c-o> `` | Copy selected text to clipboard |  |
-| `` <space> `` | Toggle staged | Toggle lijnen staged / unstaged |
-| `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` o `` | Open bestand | Open file in default application. |
-| `` e `` | Verander bestand | Open file in external editor. |
-| `` <esc> `` | Ga terug naar het bestanden paneel |  |
-| `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` c `` | Commit veranderingen | Commit staged changes. |
-| `` w `` | Commit veranderingen zonder pre-commit hook |  |
-| `` C `` | Commit veranderingen met de git editor |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | Start met zoeken |  |
+## Hoofd Paneel (Patch Bouwen)
 
-## Stash
+<pre>
+  <kbd>esc</kbd>: sluit lijn-bij-lijn modus
+  <kbd>o</kbd>: open bestand
+  <kbd>▲</kbd>: selecteer de vorige lijn
+  <kbd>▼</kbd>: selecteer de volgende lijn
+  <kbd>◄</kbd>: selecteer de vorige hunk
+  <kbd>►</kbd>: selecteer de volgende hunk
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>space</kbd>: voeg toe/verwijder lijn(en) in patch
+  <kbd>v</kbd>: toggle drag selecteer
+  <kbd>V</kbd>: toggle drag selecteer
+  <kbd>a</kbd>: toggle selecteer hunk
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Toepassen | Apply the stash entry to your working directory. |
-| `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
-| `` d `` | Laten vallen | Remove the stash entry from the stash list. |
-| `` n `` | Nieuwe branch | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
-| `` r `` | Rename stash |  |
-| `` <enter> `` | Bekijk gecommite bestanden |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
+## Hoofd Paneel (Staging)
 
-## Status
+<pre>
+  <kbd>esc</kbd>: ga terug naar het bestanden paneel
+  <kbd>space</kbd>: toggle lijnen staged / unstaged
+  <kbd>d</kbd>: verwijdert change (git reset)
+  <kbd>tab</kbd>: ga naar een ander paneel
+  <kbd>o</kbd>: open bestand
+  <kbd>▲</kbd>: selecteer de vorige lijn
+  <kbd>▼</kbd>: selecteer de volgende lijn
+  <kbd>◄</kbd>: selecteer de vorige hunk
+  <kbd>►</kbd>: selecteer de volgende hunk
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>e</kbd>: verander bestand
+  <kbd>o</kbd>: open bestand
+  <kbd>v</kbd>: toggle drag selecteer
+  <kbd>V</kbd>: toggle drag selecteer
+  <kbd>a</kbd>: toggle selecteer hunk
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>c</kbd>: Commit veranderingen
+  <kbd>w</kbd>: commit veranderingen zonder pre-commit hook
+  <kbd>C</kbd>: commit veranderingen met de git editor
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` o `` | Open config bestand | Open file in default application. |
-| `` e `` | Verander config bestand | Open file in external editor. |
-| `` u `` | Check voor updates |  |
-| `` <enter> `` | Wissel naar een recente repo |  |
-| `` a `` | Alle logs van de branch laten zien |  |
+## Menu Paneel
 
-## Sub-commits
+<pre>
+  <kbd>esc</kbd>: sluit menu
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopieer commit hash naar klembord |  |
-| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | Open commit in browser |  |
-| `` n `` | Creëer nieuwe branch van commit |  |
-| `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | Bekijk gecommite bestanden |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Start met zoeken |  |
+## Stash Paneel
 
-## Submodules
+<pre>
+  <kbd>enter</kbd>: bekijk bestanden van stash entry
+  <kbd>space</kbd>: toepassen
+  <kbd>g</kbd>: pop
+  <kbd>d</kbd>: laten vallen
+  <kbd>n</kbd>: nieuwe branch
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopieer submodule naam naar klembord |  |
-| `` <enter> `` | Enter | Enter submodule |
-| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
-| `` u `` | Update | Update selected submodule. |
-| `` n `` | Voeg nieuwe submodule toe |  |
-| `` e `` | Update submodule URL |  |
-| `` i `` | Initialize | Initialiseer submodule |
-| `` b `` | Bekijk bulk submodule opties |  |
-| `` / `` | Filter the current view by text |  |
+## Status Paneel
 
-## Tags
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Uitchecken | Checkout the selected tag tag as a detached HEAD. |
-| `` n `` | Creëer tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` d `` | Delete | View delete options for local/remote tag. |
-| `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | Bekijk commits |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## Worktrees
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` n `` | New worktree |  |
-| `` <space> `` | Switch | Switch to the selected worktree. |
-| `` o `` | Open in editor |  |
-| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
-| `` / `` | Filter the current view by text |  |
+<pre>
+  <kbd>e</kbd>: verander config bestand
+  <kbd>o</kbd>: open config bestand
+  <kbd>u</kbd>: check voor updates
+  <kbd>enter</kbd>: wissel naar een recente repo
+  <kbd>a</kbd>: alle logs van de branch laten zien
+</pre>

docs/keybindings/Keybindings_pl.md

@@ -1,364 +1,307 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+# This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root.
 
-# Lazygit Skróty klawiszowe
+# Lazygit Keybindings
 
-_Legenda: `<c-b>` oznacza ctrl+b, `<a-b>` oznacza alt+b, `B` oznacza shift+b_
+## Globalne
 
-## Globalne skróty klawiszowe
+<pre>
+  <kbd>ctrl+r</kbd>: switch to a recent repo (<c-r>)
+  <kbd>pgup</kbd>: scroll up main panel (fn+up)
+  <kbd>pgdown</kbd>: scroll down main panel (fn+down)
+  <kbd>m</kbd>: widok scalenia/opcje zmiany bazy
+  <kbd>ctrl+p</kbd>: view custom patch options
+  <kbd>P</kbd>: push
+  <kbd>p</kbd>: pull
+  <kbd>R</kbd>: odśwież
+  <kbd>x</kbd>: open menu
+  <kbd>z</kbd>: undo (via reflog) (experimental)
+  <kbd>ctrl+z</kbd>: redo (via reflog) (experimental)
+  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
+  <kbd>_</kbd>: prev screen mode
+  <kbd>:</kbd>: wykonaj własną komendę
+  <kbd>ctrl+s</kbd>: view filter-by-path options
+  <kbd>W</kbd>: open diff menu
+  <kbd>ctrl+e</kbd>: open diff menu
+  <kbd>@</kbd>: open command log menu
+  <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
+  <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-r> `` | Przełącz na ostatnie repozytorium |  |
-| `` <pgup> (fn+up/shift+k) `` | Przewiń główne okno w górę |  |
-| `` <pgdown> (fn+down/shift+j) `` | Przewiń główne okno w dół |  |
-| `` @ `` | Pokaż opcje dziennika poleceń | Pokaż opcje dla dziennika poleceń, np. pokazywanie/ukrywanie dziennika poleceń i skupienie na dzienniku poleceń. |
-| `` P `` | Wypchnij | Wypchnij bieżącą gałąź do jej gałęzi nadrzędnej. Jeśli nie skonfigurowano gałęzi nadrzędnej, zostaniesz poproszony o skonfigurowanie gałęzi nadrzędnej. |
-| `` p `` | Pociągnij | Pociągnij zmiany z zdalnego dla bieżącej gałęzi. Jeśli nie skonfigurowano gałęzi nadrzędnej, zostaniesz poproszony o skonfigurowanie gałęzi nadrzędnej. |
-| `` } `` | Zwiększ rozmiar kontekstu w widoku różnic | Zwiększ ilość kontekstu pokazywanego wokół zmian w widoku różnic. |
-| `` { `` | Zmniejsz rozmiar kontekstu w widoku różnic | Zmniejsz ilość kontekstu pokazywanego wokół zmian w widoku różnic. |
-| `` : `` | Wykonaj polecenie niestandardowe | Wyświetl monit, w którym możesz wprowadzić polecenie powłoki do wykonania. Nie należy mylić z wcześniej skonfigurowanymi poleceniami niestandardowymi. |
-| `` <c-p> `` | Wyświetl opcje niestandardowej łatki |  |
-| `` m `` | Pokaż opcje scalania/rebase | Pokaż opcje do przerwania/kontynuowania/pominięcia bieżącego scalania/rebase. |
-| `` R `` | Odśwież | Odśwież stan git (tj. uruchom `git status`, `git branch`, itp. w tle, aby zaktualizować zawartość paneli). To nie uruchamia `git fetch`. |
-| `` + `` | Następny tryb ekranu (normalny/półpełny/pełnoekranowy) |  |
-| `` _ `` | Poprzedni tryb ekranu |  |
-| `` ? `` | Otwórz menu przypisań klawiszy |  |
-| `` <c-s> `` | Pokaż opcje filtrowania | Pokaż opcje filtrowania dziennika commitów, tak aby pokazywane były tylko commity pasujące do filtra. |
-| `` W `` | Pokaż opcje różnicowania | Pokaż opcje dotyczące różnicowania dwóch refów, np. różnicowanie względem wybranego refa, wprowadzanie refa do różnicowania i odwracanie kierunku różnic. |
-| `` <c-e> `` | Pokaż opcje różnicowania | Pokaż opcje dotyczące różnicowania dwóch refów, np. różnicowanie względem wybranego refa, wprowadzanie refa do różnicowania i odwracanie kierunku różnic. |
-| `` q `` | Wyjdź |  |
-| `` <esc> `` | Anuluj |  |
-| `` <c-w> `` | Przełącz białe znaki | Przełącz czy zmiany białych znaków są pokazywane w widoku różnic. |
-| `` z `` | Cofnij | Dziennik reflog zostanie użyty do określenia, jakie polecenie git należy uruchomić, aby cofnąć ostatnie polecenie git. Nie obejmuje to zmian w drzewie roboczym; brane są pod uwagę tylko commity. |
-| `` <c-z> `` | Ponów | Dziennik reflog zostanie użyty do określenia, jakie polecenie git należy uruchomić, aby ponowić ostatnie polecenie git. Nie obejmuje to zmian w drzewie roboczym; brane są pod uwagę tylko commity. |
+## List Panel Navigation
 
-## Nawigacja panelu listy
+<pre>
+  <kbd>.</kbd>: next page
+  <kbd>,</kbd>: previous page
+  <kbd><</kbd>: scroll to top
+  <kbd>></kbd>: scroll to bottom
+  <kbd>/</kbd>: start search
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` , `` | Poprzednia strona |  |
-| `` . `` | Następna strona |  |
-| `` < `` | Przewiń do góry |  |
-| `` > `` | Przewiń do dołu |  |
-| `` v `` | Przełącz zaznaczenie zakresu |  |
-| `` <s-down> `` | Zaznacz zakres w dół |  |
-| `` <s-up> `` | Zaznacz zakres w górę |  |
-| `` / `` | Szukaj w bieżącym widoku po tekście |  |
-| `` H `` | Przewiń w lewo |  |
-| `` L `` | Przewiń w prawo |  |
-| `` ] `` | Następna zakładka |  |
-| `` [ `` | Poprzednia zakładka |  |
+## Gałęzie Panel (Branches Tab)
 
-## Commity
+<pre>
+  <kbd>space</kbd>: przełącz
+  <kbd>o</kbd>: utwórz żądanie pobrania
+  <kbd>O</kbd>: utwórz opcje żądania ściągnięcia
+  <kbd>ctrl+y</kbd>: skopiuj adres URL żądania pobrania do schowka
+  <kbd>c</kbd>: przełącz używając nazwy
+  <kbd>F</kbd>: wymuś przełączenie
+  <kbd>n</kbd>: nowa gałąź
+  <kbd>d</kbd>: usuń gałąź
+  <kbd>r</kbd>: zmiana bazy gałęzi
+  <kbd>M</kbd>: scal do obecnej gałęzi
+  <kbd>i</kbd>: show git-flow options
+  <kbd>f</kbd>: fast-forward this branch from its upstream
+  <kbd>g</kbd>: wyświetl opcje resetu
+  <kbd>R</kbd>: rename branch
+  <kbd>ctrl+o</kbd>: copy branch name to clipboard
+  <kbd>enter</kbd>: view commits
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopiuj hash commita do schowka |  |
-| `` <c-r> `` | Resetuj wybrane (cherry-picked) commity |  |
-| `` b `` | Zobacz opcje bisect |  |
-| `` s `` | Scal | Scal wybrany commit z commitami poniżej. Wiadomość wybranego commita zostanie dołączona do commita poniżej. |
-| `` f `` | Poprawka | Włącz wybrany commit do commita poniżej. Podobnie do fixup, ale wiadomość wybranego commita zostanie odrzucona. |
-| `` r `` | Przeformułuj | Przeformułuj wiadomość wybranego commita. |
-| `` R `` | Przeformułuj za pomocą edytora |  |
-| `` d `` | Usuń | Usuń wybrany commit. To usunie commit z gałęzi za pomocą rebazowania. Jeśli commit wprowadza zmiany, od których zależą późniejsze commity, być może będziesz musiał rozwiązać konflikty scalania. |
-| `` e `` | Edytuj (rozpocznij interaktywne rebazowanie) | Edytuj wybrany commit. Użyj tego, aby rozpocząć interaktywne rebazowanie od wybranego commita. Podczas trwania rebazowania, to oznaczy wybrany commit do edycji, co oznacza, że po kontynuacji rebazowania, rebazowanie zostanie wstrzymane na wybranym commicie, aby umożliwić wprowadzenie zmian. |
-| `` i `` | Rozpocznij interaktywny rebase | Rozpocznij interaktywny rebase dla commitów na twoim branchu. To będzie zawierać wszystkie commity od HEAD do pierwszego commita scalenia lub commita głównego brancha.
-Jeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita, naciśnij `e`. |
-| `` p `` | Wybierz | Oznacz wybrany commit do wybrania (podczas rebazowania). Oznacza to, że commit zostanie zachowany po kontynuacji rebazowania. |
-| `` F `` | Utwórz commit fixup | Utwórz commit 'fixup!' dla wybranego commita. Później możesz nacisnąć `S` na tym samym commicie, aby zastosować wszystkie powyższe commity fixup. |
-| `` S `` | Zastosuj commity fixup | Scal wszystkie commity 'fixup!', albo powyżej wybranego commita, albo wszystkie w bieżącej gałęzi (autosquash). |
-| `` <c-j> `` | Przesuń commit w dół |  |
-| `` <c-k> `` | Przesuń commit w górę |  |
-| `` V `` | Wklej (cherry-pick) |  |
-| `` B `` | Oznacz jako bazowy commit dla rebase | Wybierz bazowy commit dla następnego rebase. Kiedy robisz rebase na branch, tylko commity powyżej bazowego commita zostaną przeniesione. Używa to polecenia `git rebase --onto`. |
-| `` A `` | Popraw | Popraw commit ze zmianami zatwierdzonymi. Jeśli wybrany commit jest commit HEAD, to wykona `git commit --amend`. W przeciwnym razie commit zostanie poprawiony za pomocą rebazowania. |
-| `` a `` | Popraw atrybut commita | Ustaw/Resetuj autora commita lub ustaw współautora. |
-| `` t `` | Cofnij | Utwórz commit cofający dla wybranego commita, który stosuje zmiany wybranego commita w odwrotnej kolejności. |
-| `` T `` | Otaguj commit | Utwórz nowy tag wskazujący na wybrany commit. Zostaniesz poproszony o wprowadzenie nazwy tagu i opcjonalnego opisu. |
-| `` <c-l> `` | Zobacz opcje logów | Zobacz opcje dla logów commitów, np. zmiana kolejności sortowania, ukrywanie grafu gita, pokazywanie całego grafu gita. |
-| `` <space> `` | Przełącz | Przełącz wybrany commit jako odłączoną HEAD. |
-| `` y `` | Kopiuj atrybut commita do schowka | Kopiuj atrybut commita do schowka (np. hash, URL, różnice, wiadomość, autor). |
-| `` o `` | Otwórz commit w przeglądarce |  |
-| `` n `` | Utwórz nową gałąź z commita |  |
-| `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
-| `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
-| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
-| `` <enter> `` | Wyświetl pliki |  |
-| `` w `` | Zobacz opcje drzewa pracy |  |
-| `` / `` | Szukaj w bieżącym widoku po tekście |  |
+## Gałęzie Panel (Remote Branches (in Remotes tab))
 
-## Drzewa pracy
+<pre>
+  <kbd>esc</kbd>: wróć do listy repozytoriów zdalnych
+  <kbd>g</kbd>: wyświetl opcje resetu
+  <kbd>enter</kbd>: view commits
+  <kbd>space</kbd>: przełącz
+  <kbd>n</kbd>: nowa gałąź
+  <kbd>M</kbd>: scal do obecnej gałęzi
+  <kbd>d</kbd>: usuń gałąź
+  <kbd>r</kbd>: zmiana bazy gałęzi
+  <kbd>u</kbd>: set as upstream of checked-out branch
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` n `` | Nowe drzewo pracy |  |
-| `` <space> `` | Przełącz | Przełącz do wybranego drzewa pracy. |
-| `` o `` | Otwórz w edytorze |  |
-| `` d `` | Usuń | Usuń wybrane drzewo pracy. To usunie zarówno katalog drzewa pracy, jak i metadane o drzewie pracy w katalogu .git. |
-| `` / `` | Filtruj bieżący widok po tekście |  |
+## Gałęzie Panel (Remotes Tab)
 
-## Główny panel (budowanie łatki)
+<pre>
+  <kbd>f</kbd>: fetch remote
+  <kbd>n</kbd>: add new remote
+  <kbd>d</kbd>: remove remote
+  <kbd>e</kbd>: edit remote
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | Idź do poprzedniego fragmentu |  |
-| `` <right> `` | Idź do następnego fragmentu |  |
-| `` v `` | Przełącz zaznaczenie zakresu |  |
-| `` a `` | Zaznacz fragment | Przełącz tryb zaznaczania fragmentu. |
-| `` <c-o> `` | Kopiuj zaznaczony tekst do schowka |  |
-| `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
-| `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
-| `` <space> `` | Przełącz linie w łatce |  |
-| `` <esc> `` | Wyjdź z budowniczego niestandardowej łatki |  |
-| `` / `` | Szukaj w bieżącym widoku po tekście |  |
+## Gałęzie Panel (Sub-commits)
 
-## Lokalne gałęzie
+<pre>
+  <kbd>enter</kbd>: przeglądaj pliki commita
+  <kbd>space</kbd>: checkout commit
+  <kbd>g</kbd>: wyświetl opcje resetu
+  <kbd>n</kbd>: nowa gałąź
+  <kbd>c</kbd>: kopiuj commit (przebieranie)
+  <kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopiuj nazwę gałęzi do schowka |  |
-| `` i `` | Pokaż opcje git-flow |  |
-| `` <space> `` | Przełącz | Przełącz wybrany element. |
-| `` n `` | Nowa gałąź |  |
-| `` o `` | Utwórz żądanie ściągnięcia |  |
-| `` O `` | Zobacz opcje tworzenia pull requesta |  |
-| `` <c-y> `` | Kopiuj adres URL żądania ściągnięcia do schowka |  |
-| `` c `` | Przełącz według nazwy | Przełącz według nazwy. W polu wprowadzania możesz wpisać '-' aby przełączyć się na ostatnią gałąź. |
-| `` F `` | Wymuś przełączenie | Wymuś przełączenie wybranej gałęzi. To spowoduje odrzucenie wszystkich lokalnych zmian w drzewie roboczym przed przełączeniem na wybraną gałąź. |
-| `` d `` | Usuń | Wyświetl opcje usuwania lokalnej/odległej gałęzi. |
-| `` r `` | Przebazuj | Przebazuj przełączoną gałąź na wybraną gałąź. |
-| `` M `` | Scal | Scal wybraną gałąź z aktualnie sprawdzoną gałęzią. |
-| `` f `` | Szybkie przewijanie | Szybkie przewijanie wybranej gałęzi z jej źródła. |
-| `` T `` | Nowy tag |  |
-| `` s `` | Kolejność sortowania |  |
-| `` g `` | Reset |  |
-| `` R `` | Zmień nazwę gałęzi |  |
-| `` u `` | Pokaż opcje upstream | Pokaż opcje dotyczące upstream gałęzi, np. ustawianie/usuwanie upstream i resetowanie do upstream. |
-| `` <enter> `` | Pokaż commity |  |
-| `` w `` | Zobacz opcje drzewa pracy |  |
-| `` / `` | Filtruj bieżący widok po tekście |  |
+## Gałęzie Panel (Tags Tab)
 
-## Menu
+<pre>
+  <kbd>space</kbd>: przełącz
+  <kbd>d</kbd>: delete tag
+  <kbd>P</kbd>: push tag
+  <kbd>n</kbd>: create tag
+  <kbd>g</kbd>: wyświetl opcje resetu
+  <kbd>enter</kbd>: view commits
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Wykonaj |  |
-| `` <esc> `` | Zamknij |  |
-| `` / `` | Filtruj bieżący widok po tekście |  |
+## Pliki commita Panel
 
-## Panel główny (normalny)
+<pre>
+  <kbd>ctrl+o</kbd>: copy the committed file name to the clipboard
+  <kbd>c</kbd>: plik wybierania
+  <kbd>d</kbd>: porzuć zmiany commita dla tego pliku
+  <kbd>o</kbd>: otwórz plik
+  <kbd>e</kbd>: edytuj plik
+  <kbd>space</kbd>: toggle file included in patch
+  <kbd>enter</kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
+  <kbd>`</kbd>: toggle file tree view
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` mouse wheel down (fn+up) `` | Przewiń w dół |  |
-| `` mouse wheel up (fn+down) `` | Przewiń w górę |  |
+## Commity Panel (Commity)
 
-## Panel główny (scalanie)
+<pre>
+  <kbd>ctrl+l</kbd>: open log menu
+  <kbd>s</kbd>: ściśnij
+  <kbd>r</kbd>: zmień nazwę commita
+  <kbd>R</kbd>: zmień nazwę commita w edytorze
+  <kbd>g</kbd>: zresetuj do tego commita
+  <kbd>f</kbd>: napraw commit
+  <kbd>F</kbd>: utwórz commit naprawczy dla tego commita
+  <kbd>S</kbd>: spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)
+  <kbd>d</kbd>: usuń commit
+  <kbd>ctrl+j</kbd>: przenieś commit 1 w dół
+  <kbd>ctrl+k</kbd>: przenieś commit 1 w górę
+  <kbd>e</kbd>: edytuj commit
+  <kbd>A</kbd>: popraw commit zmianami z poczekalni
+  <kbd>p</kbd>: wybierz commit (podczas zmiany bazy)
+  <kbd>t</kbd>: odwróć commit
+  <kbd>c</kbd>: kopiuj commit (przebieranie)
+  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
+  <kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
+  <kbd>v</kbd>: wklej commity (przebieranie)
+  <kbd>enter</kbd>: przeglądaj pliki commita
+  <kbd>space</kbd>: checkout commit
+  <kbd>n</kbd>: create new branch off of commit
+  <kbd>T</kbd>: tag commit
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>ctrl+y</kbd>: copy commit message to clipboard
+  <kbd>o</kbd>: open commit in browser
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Wybierz fragment |  |
-| `` b `` | Wybierz wszystkie fragmenty |  |
-| `` <up> `` | Poprzedni fragment |  |
-| `` <down> `` | Następny fragment |  |
-| `` <left> `` | Poprzedni konflikt |  |
-| `` <right> `` | Następny konflikt |  |
-| `` z `` | Cofnij | Cofnij ostatnie rozwiązanie konfliktu scalania. |
-| `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
-| `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
-| `` M `` | Otwórz zewnętrzne narzędzie scalania | Uruchom `git mergetool`. |
-| `` <esc> `` | Wróć do panelu plików |  |
+## Commity Panel (Reflog Tab)
 
-## Panel główny (zatwierdzanie)
+<pre>
+  <kbd>enter</kbd>: przeglądaj pliki commita
+  <kbd>space</kbd>: checkout commit
+  <kbd>g</kbd>: wyświetl opcje resetu
+  <kbd>c</kbd>: kopiuj commit (przebieranie)
+  <kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | Idź do poprzedniego fragmentu |  |
-| `` <right> `` | Idź do następnego fragmentu |  |
-| `` v `` | Przełącz zaznaczenie zakresu |  |
-| `` a `` | Zaznacz fragment | Przełącz tryb zaznaczania fragmentu. |
-| `` <c-o> `` | Kopiuj zaznaczony tekst do schowka |  |
-| `` <space> `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. |
-| `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. |
-| `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
-| `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
-| `` <esc> `` | Wróć do panelu plików |  |
-| `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
-| `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. |
-| `` c `` | Commit | Zatwierdź zmiany zatwierdzone. |
-| `` w `` | Zatwierdź zmiany bez hooka pre-commit |  |
-| `` C `` | Zatwierdź zmiany używając edytora git |  |
-| `` <c-f> `` | Znajdź bazowy commit do poprawki | Znajdź commit, na którym opierają się Twoje obecne zmiany, w celu poprawienia/zmiany commita. To pozwala Ci uniknąć przeglądania commitów w Twojej gałęzi jeden po drugim, aby zobaczyć, który commit powinien być poprawiony/zmieniony. Zobacz dokumentację: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | Szukaj w bieżącym widoku po tekście |  |
+## Extras Panel
 
-## Panel potwierdzenia
+<pre>
+  <kbd>@</kbd>: open command log menu
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Potwierdź |  |
-| `` <esc> `` | Zamknij/Anuluj |  |
+## Pliki Panel
 
-## Pliki
+<pre>
+  <kbd>ctrl+b</kbd>: Filtrowanie commitów
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopiuj ścieżkę do schowka |  |
-| `` <space> `` | Zatwierdź | Przełącz zatwierdzenie dla wybranego pliku. |
-| `` <c-b> `` | Filtruj pliki według statusu |  |
-| `` y `` | Kopiuj do schowka |  |
-| `` c `` | Commit | Zatwierdź zmiany zatwierdzone. |
-| `` w `` | Zatwierdź zmiany bez hooka pre-commit |  |
-| `` A `` | Popraw ostatni commit |  |
-| `` C `` | Zatwierdź zmiany używając edytora git |  |
-| `` <c-f> `` | Znajdź bazowy commit do poprawki | Znajdź commit, na którym opierają się Twoje obecne zmiany, w celu poprawienia/zmiany commita. To pozwala Ci uniknąć przeglądania commitów w Twojej gałęzi jeden po drugim, aby zobaczyć, który commit powinien być poprawiony/zmieniony. Zobacz dokumentację: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | Edytuj | Otwórz plik w zewnętrznym edytorze. |
-| `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
-| `` i `` | Ignoruj lub wyklucz plik |  |
-| `` r `` | Odśwież pliki |  |
-| `` s `` | Schowaj | Schowaj wszystkie zmiany. Dla innych wariantów schowania, użyj klawisza wyświetlania opcji schowka. |
-| `` S `` | Wyświetl opcje schowka | Wyświetl opcje schowka (np. schowaj wszystko, schowaj zatwierdzone, schowaj niezatwierdzone). |
-| `` a `` | Zatwierdź wszystko | Przełącz zatwierdzenie/odznaczenie dla wszystkich plików w drzewie roboczym. |
-| `` <enter> `` | Zatwierdź linie / Zwiń katalog | Jeśli wybrany element jest plikiem, skup się na widoku zatwierdzania, aby móc zatwierdzać poszczególne fragmenty/linie. Jeśli wybrany element jest katalogiem, zwiń/rozwiń go. |
-| `` d `` | Odrzuć | Wyświetl opcje odrzucania zmian w wybranym pliku. |
-| `` g `` | Pokaż opcje resetowania do upstream |  |
-| `` D `` | Reset | Wyświetl opcje resetu dla drzewa roboczego (np. zniszczenie drzewa roboczego). |
-| `` ` `` | Przełącz widok drzewa plików | Przełącz widok plików między płaskim a drzewem. Płaski układ pokazuje wszystkie ścieżki plików na jednej liście, układ drzewa grupuje pliki według katalogów. |
-| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
-| `` M `` | Otwórz zewnętrzne narzędzie scalania | Uruchom `git mergetool`. |
-| `` f `` | Pobierz | Pobierz zmiany ze zdalnego serwera. |
-| `` / `` | Szukaj w bieżącym widoku po tekście |  |
+## Pliki Panel (Pliki)
 
-## Pliki commita
+<pre>
+  <kbd>c</kbd>: Zatwierdź zmiany
+  <kbd>w</kbd>: zatwierdź zmiany bez skryptu pre-commit
+  <kbd>A</kbd>: Zmień ostatni commit
+  <kbd>C</kbd>: Zatwierdź zmiany używając edytora
+  <kbd>space</kbd>: przełącz stan poczekalni
+  <kbd>d</kbd>: pokaż opcje porzucania zmian
+  <kbd>e</kbd>: edytuj plik
+  <kbd>o</kbd>: otwórz plik
+  <kbd>i</kbd>: dodaj do .gitignore
+  <kbd>r</kbd>: odśwież pliki
+  <kbd>s</kbd>: przechowaj zmiany
+  <kbd>S</kbd>: wyświetl opcje schowka
+  <kbd>a</kbd>: przełącz stan poczekalni wszystkich
+  <kbd>D</kbd>: wyświetl opcje resetu
+  <kbd>enter</kbd>: zatwierdź pojedyncze linie
+  <kbd>f</kbd>: pobierz
+  <kbd>ctrl+o</kbd>: copy the file name to the clipboard
+  <kbd>g</kbd>: view upstream reset options
+  <kbd>`</kbd>: toggle file tree view
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopiuj ścieżkę do schowka |  |
-| `` c `` | Przełącz | Przełącz plik. Zastępuje plik w twoim drzewie roboczym wersją z wybranego commita. |
-| `` d `` | Usuń | Odrzuć zmiany w tym pliku z tego commita. Uruchamia interaktywny rebase w tle, więc możesz otrzymać konflikt scalania, jeśli późniejszy commit również zmienia ten plik. |
-| `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
-| `` e `` | Edytuj | Otwórz plik w zewnętrznym edytorze. |
-| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
-| `` <space> `` | Przełącz plik włączony w łatkę | Przełącz, czy plik jest włączony w niestandardową łatkę. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` a `` | Przełącz wszystkie pliki | Dodaj/usuń wszystkie pliki commita do niestandardowej łatki. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Wejdź do pliku / Przełącz zwiń katalog | Jeśli plik jest wybrany, wejdź do pliku, aby móc dodawać/usuwać poszczególne linie do niestandardowej łatki. Jeśli wybrany jest katalog, przełącz katalog. |
-| `` ` `` | Przełącz widok drzewa plików | Przełącz widok plików między płaskim a drzewem. Płaski układ pokazuje wszystkie ścieżki plików na jednej liście, układ drzewa grupuje pliki według katalogów. |
-| `` / `` | Szukaj w bieżącym widoku po tekście |  |
+## Pliki Panel (Submodules)
 
-## Podsumowanie commita
+<pre>
+  <kbd>ctrl+o</kbd>: copy submodule name to clipboard
+  <kbd>enter</kbd>: enter submodule
+  <kbd>d</kbd>: view reset and remove submodule options
+  <kbd>u</kbd>: update submodule
+  <kbd>n</kbd>: add new submodule
+  <kbd>e</kbd>: update submodule URL
+  <kbd>i</kbd>: initialize submodule
+  <kbd>b</kbd>: view bulk submodule options
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Potwierdź |  |
-| `` <esc> `` | Zamknij |  |
+## Główne Panel (Scalanie)
 
-## Reflog
+<pre>
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>esc</kbd>: wróć do panelu plików
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>space</kbd>: wybierz kawałek
+  <kbd>b</kbd>: wybierz wszystkie kawałki
+  <kbd>◄</kbd>: poprzedni konflikt
+  <kbd>►</kbd>: następny konflikt
+  <kbd>▲</kbd>: wybierz poprzedni kawałek
+  <kbd>▼</kbd>: wybierz następny kawałek
+  <kbd>z</kbd>: cofnij
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopiuj hash commita do schowka |  |
-| `` <space> `` | Przełącz | Przełącz wybrany commit jako odłączoną HEAD. |
-| `` y `` | Kopiuj atrybut commita do schowka | Kopiuj atrybut commita do schowka (np. hash, URL, różnice, wiadomość, autor). |
-| `` o `` | Otwórz commit w przeglądarce |  |
-| `` n `` | Utwórz nową gałąź z commita |  |
-| `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
-| `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
-| `` <c-r> `` | Resetuj wybrane (cherry-picked) commity |  |
-| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
-| `` <enter> `` | Pokaż commity |  |
-| `` w `` | Zobacz opcje drzewa pracy |  |
-| `` / `` | Filtruj bieżący widok po tekście |  |
+## Główne Panel (Zwykłe)
 
-## Schowek
+<pre>
+  <kbd>Ő</kbd>: przewiń w dół (fn+up)
+  <kbd>ő</kbd>: przewiń w górę (fn+down)
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Zastosuj | Zastosuj wpis schowka do katalogu roboczego. |
-| `` g `` | Wyciągnij | Zastosuj wpis schowka do katalogu roboczego i usuń wpis schowka. |
-| `` d `` | Usuń | Usuń wpis schowka z listy schowka. |
-| `` n `` | Nowa gałąź | Utwórz nową gałąź z wybranego wpisu schowka. Działa poprzez przełączenie git na commit, na którym wpis schowka został utworzony, tworzenie nowej gałęzi z tego commita, a następnie zastosowanie wpisu schowka do nowej gałęzi jako dodatkowego commita. |
-| `` r `` | Zmień nazwę schowka |  |
-| `` <enter> `` | Wyświetl pliki |  |
-| `` w `` | Zobacz opcje drzewa pracy |  |
-| `` / `` | Filtruj bieżący widok po tekście |  |
+## Główne Panel (Patch Building)
 
-## Status
+<pre>
+  <kbd>esc</kbd>: wyście z trybu "linia po linii"
+  <kbd>o</kbd>: otwórz plik
+  <kbd>▲</kbd>: poprzednia linia
+  <kbd>▼</kbd>: następna linia
+  <kbd>◄</kbd>: poprzedni kawałek
+  <kbd>►</kbd>: następny kawałek
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>space</kbd>: add/remove line(s) to patch
+  <kbd>v</kbd>: toggle drag select
+  <kbd>V</kbd>: toggle drag select
+  <kbd>a</kbd>: toggle select hunk
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` o `` | Otwórz plik konfiguracyjny | Otwórz plik w domyślnej aplikacji. |
-| `` e `` | Edytuj plik konfiguracyjny | Otwórz plik w zewnętrznym edytorze. |
-| `` u `` | Sprawdź aktualizacje |  |
-| `` <enter> `` | Przełącz na ostatnie repozytorium |  |
-| `` a `` | Pokaż wszystkie gałęzie w logach |  |
+## Główne Panel (Poczekalnia)
 
-## Sub-commity
+<pre>
+  <kbd>esc</kbd>: wróć do panelu plików
+  <kbd>space</kbd>: toggle line staged / unstaged
+  <kbd>d</kbd>: delete change (git reset)
+  <kbd>tab</kbd>: switch to other panel
+  <kbd>o</kbd>: otwórz plik
+  <kbd>▲</kbd>: poprzednia linia
+  <kbd>▼</kbd>: następna linia
+  <kbd>◄</kbd>: poprzedni kawałek
+  <kbd>►</kbd>: następny kawałek
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>e</kbd>: edytuj plik
+  <kbd>o</kbd>: otwórz plik
+  <kbd>v</kbd>: toggle drag select
+  <kbd>V</kbd>: toggle drag select
+  <kbd>a</kbd>: toggle select hunk
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>c</kbd>: Zatwierdź zmiany
+  <kbd>w</kbd>: zatwierdź zmiany bez skryptu pre-commit
+  <kbd>C</kbd>: Zatwierdź zmiany używając edytora
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopiuj hash commita do schowka |  |
-| `` <space> `` | Przełącz | Przełącz wybrany commit jako odłączoną HEAD. |
-| `` y `` | Kopiuj atrybut commita do schowka | Kopiuj atrybut commita do schowka (np. hash, URL, różnice, wiadomość, autor). |
-| `` o `` | Otwórz commit w przeglądarce |  |
-| `` n `` | Utwórz nową gałąź z commita |  |
-| `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
-| `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
-| `` <c-r> `` | Resetuj wybrane (cherry-picked) commity |  |
-| `` <c-t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
-| `` <enter> `` | Wyświetl pliki |  |
-| `` w `` | Zobacz opcje drzewa pracy |  |
-| `` / `` | Szukaj w bieżącym widoku po tekście |  |
+## Menu Panel
 
-## Submoduły
+<pre>
+  <kbd>esc</kbd>: close menu
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopiuj nazwę submodułu do schowka |  |
-| `` <enter> `` | Wejdź | Wejdź do submodułu. Po wejściu do submodułu możesz nacisnąć `<esc>`, aby wrócić do repozytorium nadrzędnego. |
-| `` d `` | Usuń | Usuń wybrany submoduł i odpowiadający mu katalog. |
-| `` u `` | Aktualizuj | Aktualizuj wybrany submoduł. |
-| `` n `` | Nowy submoduł |  |
-| `` e `` | Zaktualizuj URL submodułu |  |
-| `` i `` | Zainicjuj | Zainicjuj wybrany submoduł, aby przygotować do pobrania. Prawdopodobnie chcesz to kontynuować, wywołując akcję 'update', aby pobrać submoduł. |
-| `` b `` | Pokaż opcje masowych operacji na submodułach |  |
-| `` / `` | Filtruj bieżący widok po tekście |  |
+## Schowek Panel
 
-## Tagi
+<pre>
+  <kbd>enter</kbd>: view stash entry's files
+  <kbd>space</kbd>: zastosuj
+  <kbd>g</kbd>: wyciągnij
+  <kbd>d</kbd>: porzuć
+  <kbd>n</kbd>: nowa gałąź
+</pre>
 
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Przełącz | Przełącz wybrany tag jako odłączoną głowę (detached HEAD). |
-| `` n `` | Nowy tag | Utwórz nowy tag z bieżącego commita. Zostaniesz poproszony o wprowadzenie nazwy tagu i opcjonalnego opisu. |
-| `` d `` | Usuń | Wyświetl opcje usuwania lokalnego/odległego tagu. |
-| `` P `` | Wyślij tag | Wyślij wybrany tag do zdalnego. Zostaniesz poproszony o wybranie zdalnego. |
-| `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
-| `` <enter> `` | Pokaż commity |  |
-| `` w `` | Zobacz opcje drzewa pracy |  |
-| `` / `` | Filtruj bieżący widok po tekście |  |
+## Status Panel
 
-## Zdalne
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Wyświetl gałęzie |  |
-| `` n `` | Nowy zdalny |  |
-| `` d `` | Usuń | Usuń wybrany zdalny. Wszelkie lokalne gałęzie śledzące gałąź zdalną z tego zdalnego nie zostaną dotknięte. |
-| `` e `` | Edytuj | Edytuj nazwę lub URL wybranego zdalnego. |
-| `` f `` | Pobierz | Pobierz aktualizacje z zdalnego repozytorium. Pobiera nowe commity i gałęzie bez scalania ich z lokalnymi gałęziami. |
-| `` / `` | Filtruj bieżący widok po tekście |  |
-
-## Zdalne gałęzie
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Kopiuj nazwę gałęzi do schowka |  |
-| `` <space> `` | Przełącz | Przełącz na nową lokalną gałąź na podstawie wybranej gałęzi zdalnej. Nowa gałąź będzie śledzić gałąź zdalną. |
-| `` n `` | Nowa gałąź |  |
-| `` M `` | Scal | Scal wybraną gałąź z aktualnie sprawdzoną gałęzią. |
-| `` r `` | Przebazuj | Przebazuj przełączoną gałąź na wybraną gałąź. |
-| `` d `` | Usuń | Usuń gałąź zdalną ze zdalnego. |
-| `` u `` | Ustaw jako upstream | Ustaw wybraną gałąź zdalną jako upstream sprawdzonej gałęzi. |
-| `` s `` | Kolejność sortowania |  |
-| `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
-| `` <enter> `` | Pokaż commity |  |
-| `` w `` | Zobacz opcje drzewa pracy |  |
-| `` / `` | Filtruj bieżący widok po tekście |  |
+<pre>
+  <kbd>e</kbd>: edytuj konfigurację
+  <kbd>o</kbd>: otwórz konfigurację
+  <kbd>u</kbd>: sprawdź aktualizacje
+  <kbd>enter</kbd>: switch to a recent repo
+  <kbd>a</kbd>: pokaż wszystkie logi gałęzi
+</pre>

docs/keybindings/Keybindings_ru.md

@@ -1,364 +0,0 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
-
-# Lazygit Связки клавиш
-
-_Связки клавиш_
-
-## Глобальные сочетания клавиш
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-r> `` | Переключиться на последний репозиторий |  |
-| `` <pgup> (fn+up/shift+k) `` | Прокрутить вверх главную панель |  |
-| `` <pgdown> (fn+down/shift+j) `` | Прокрутить вниз главную панель |  |
-| `` @ `` | Открыть меню журнала команд | View options for the command log e.g. show/hide the command log and focus the command log. |
-| `` P `` | Отправить изменения | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` p `` | Получить и слить изменения | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` } `` | Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | Increase the amount of the context shown around changes in the diff view. |
-| `` { `` | Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | Decrease the amount of the context shown around changes in the diff view. |
-| `` : `` | Выполнить пользовательскую команду | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
-| `` <c-p> `` | Просмотреть пользовательские параметры патча |  |
-| `` m `` | Просмотреть параметры слияния/перебазирования | View options to abort/continue/skip the current merge/rebase. |
-| `` R `` | Обновить | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
-| `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) |  |
-| `` _ `` | Предыдущий режим экрана |  |
-| `` ? `` | Открыть меню |  |
-| `` <c-s> `` | Просмотреть параметры фильтрации по пути | View options for filtering the commit log, so that only commits matching the filter are shown. |
-| `` W `` | Открыть меню сравнении | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` <c-e> `` | Открыть меню сравнении | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` q `` | Выйти |  |
-| `` <esc> `` | Отменить |  |
-| `` <c-w> `` | Переключить отображение изменении пробелов в просмотрщике сравнении | Toggle whether or not whitespace changes are shown in the diff view. |
-| `` z `` | Отменить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git запустить, чтобы отменить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. |
-| `` <c-z> `` | Повторить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git нужно запустить, чтобы повторить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. |
-
-## Навигация по панели списка
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` , `` | Предыдущая страница |  |
-| `` . `` | Следующая страница |  |
-| `` < `` | Пролистать наверх |  |
-| `` > `` | Прокрутить вниз |  |
-| `` v `` | Переключить выборку перетаскивания |  |
-| `` <s-down> `` | Range select down |  |
-| `` <s-up> `` | Range select up |  |
-| `` / `` | Найти |  |
-| `` H `` | Прокрутить влево |  |
-| `` L `` | Прокрутить вправо |  |
-| `` ] `` | Следующая вкладка |  |
-| `` [ `` | Предыдущая вкладка |  |
-
-## Worktrees
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` n `` | New worktree |  |
-| `` <space> `` | Switch | Switch to the selected worktree. |
-| `` o `` | Open in editor |  |
-| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
-| `` / `` | Filter the current view by text |  |
-
-## Главная панель (Индексирование)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | Выбрать предыдущую часть |  |
-| `` <right> `` | Выбрать следующую часть |  |
-| `` v `` | Переключить выборку перетаскивания |  |
-| `` a `` | Переключить выборку частей | Toggle hunk selection mode. |
-| `` <c-o> `` | Скопировать выделенный текст в буфер обмена |  |
-| `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
-| `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` o `` | Открыть файл | Open file in default application. |
-| `` e `` | Редактировать файл | Open file in external editor. |
-| `` <esc> `` | Вернуться к панели файлов |  |
-| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
-| `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
-| `` c `` | Сохранить изменения | Commit staged changes. |
-| `` w `` | Закоммитить изменения без предварительного хука коммита |  |
-| `` C `` | Сохранить изменения с помощью редактора git |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | Найти |  |
-
-## Главная панель (Обычный)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` mouse wheel down (fn+up) `` | Прокрутить вниз |  |
-| `` mouse wheel up (fn+down) `` | Прокрутить вверх |  |
-
-## Главная панель (Слияние)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Выбрать эту часть |  |
-| `` b `` | Выбрать все части |  |
-| `` <up> `` | Выбрать предыдущую часть |  |
-| `` <down> `` | Выбрать следующую часть |  |
-| `` <left> `` | Выбрать предыдущий конфликт |  |
-| `` <right> `` | Выбрать следующий конфликт |  |
-| `` z `` | Отменить | Undo last merge conflict resolution. |
-| `` e `` | Редактировать файл | Open file in external editor. |
-| `` o `` | Открыть файл | Open file in default application. |
-| `` M `` | Открыть внешний инструмент слияния (git mergetool) | Run `git mergetool`. |
-| `` <esc> `` | Вернуться к панели файлов |  |
-
-## Главная панель (сборка патчей)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | Выбрать предыдущую часть |  |
-| `` <right> `` | Выбрать следующую часть |  |
-| `` v `` | Переключить выборку перетаскивания |  |
-| `` a `` | Переключить выборку частей | Toggle hunk selection mode. |
-| `` <c-o> `` | Скопировать выделенный текст в буфер обмена |  |
-| `` o `` | Открыть файл | Open file in default application. |
-| `` e `` | Редактировать файл | Open file in external editor. |
-| `` <space> `` | Добавить/удалить строку(и) для патча |  |
-| `` <esc> `` | Выйти из сборщика пользовательских патчей |  |
-| `` / `` | Найти |  |
-
-## Журнал ссылок (Reflog)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Скопировать hash коммита в буфер обмена |  |
-| `` <space> `` | Переключить | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | Открыть коммит в браузере |  |
-| `` n `` | Создать новую ветку с этого коммита |  |
-| `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | Просмотреть коммиты |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## Коммиты
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Скопировать hash коммита в буфер обмена |  |
-| `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов |  |
-| `` b `` | Просмотреть параметры бинарного поиска |  |
-| `` s `` | Объединить коммиты (Squash) | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | Объединить несколько коммитов в один отбросив сообщение коммита (Fixup)  | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
-| `` r `` | Перефразировать коммит | Reword the selected commit's message. |
-| `` R `` | Переписать коммит с помощью редактора |  |
-| `` d `` | Удалить коммит | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
-| `` e `` | Edit (start interactive rebase) | Изменить коммит |
-| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
-If you would instead like to start an interactive rebase from the selected commit, press `e`. |
-| `` p `` | Pick | Выбрать коммит (в середине перебазирования) |
-| `` F `` | Создать fixup коммит | Создать fixup коммит для этого коммита |
-| `` S `` | Apply fixup commits | Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) |
-| `` <c-j> `` | Переместить коммит вниз на один |  |
-| `` <c-k> `` | Переместить коммит вверх на один |  |
-| `` V `` | Вставить отобранные коммиты (cherry-pick) |  |
-| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
-| `` A `` | Amend | Править последний коммит с проиндексированными изменениями |
-| `` a `` | Установить/убрать автора коммита | Set/Reset commit author or set co-author. |
-| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | Пометить коммит тегом | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <c-l> `` | Открыть меню журнала | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
-| `` <space> `` | Переключить | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | Открыть коммит в браузере |  |
-| `` n `` | Создать новую ветку с этого коммита |  |
-| `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | Просмотреть файлы выбранного элемента |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Найти |  |
-
-## Локальные Ветки
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Скопировать название ветки в буфер обмена |  |
-| `` i `` | Показать параметры git-flow |  |
-| `` <space> `` | Переключить | Checkout selected item. |
-| `` n `` | Новая ветка |  |
-| `` o `` | Создать запрос на принятие изменений |  |
-| `` O `` | Создать параметры запроса принятие изменений |  |
-| `` <c-y> `` | Скопировать URL запроса на принятие изменений в буфер обмена |  |
-| `` c `` | Переключить по названию | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
-| `` F `` | Принудительное переключение | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | Delete | View delete options for local/remote branch. |
-| `` r `` | Перебазировать переключённую ветку на эту ветку | Rebase the checked-out branch onto the selected branch. |
-| `` M `` | Слияние с текущей переключённой веткой | Merge selected branch into currently checked out branch. |
-| `` f `` | Перемотать эту ветку вперёд из её upstream-ветки | Fast-forward selected branch from its upstream. |
-| `` T `` | Создать тег |  |
-| `` s `` | Порядок сортировки |  |
-| `` g `` | Просмотреть параметры сброса |  |
-| `` R `` | Переименовать ветку |  |
-| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
-| `` <enter> `` | Просмотреть коммиты |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## Меню
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Выполнить |  |
-| `` <esc> `` | Закрыть |  |
-| `` / `` | Filter the current view by text |  |
-
-## Панель Подтверждения
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Подтвердить |  |
-| `` <esc> `` | Закрыть/отменить |  |
-
-## Подкоммиты
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Скопировать hash коммита в буфер обмена |  |
-| `` <space> `` | Переключить | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | Открыть коммит в браузере |  |
-| `` n `` | Создать новую ветку с этого коммита |  |
-| `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | Просмотреть файлы выбранного элемента |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Найти |  |
-
-## Подмодули
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Скопировать название подмодуля в буфер обмена |  |
-| `` <enter> `` | Enter | Ввести подмодуль |
-| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
-| `` u `` | Update | Обновить подмодуль |
-| `` n `` | Добавить новый подмодуль |  |
-| `` e `` | Обновить URL подмодуля |  |
-| `` i `` | Initialize | Инициализировать подмодуль |
-| `` b `` | Просмотреть параметры массового подмодуля |  |
-| `` / `` | Filter the current view by text |  |
-
-## Сводка коммита
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | Подтвердить |  |
-| `` <esc> `` | Закрыть |  |
-
-## Сохранить Изменения Файлов
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Скопировать название файла в буфер обмена |  |
-| `` c `` | Переключить | Переключить файл |
-| `` d `` | Remove | Отменить изменения коммита в этом файле |
-| `` o `` | Открыть файл | Open file in default application. |
-| `` e `` | Edit | Open file in external editor. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <space> `` | Переключить файлы включённые в патч | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` a `` | Переключить все файлы, включённые в патч | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
-| `` ` `` | Переключить вид дерева файлов | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` / `` | Найти |  |
-
-## Статус
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` o `` | Открыть файл конфигурации | Open file in default application. |
-| `` e `` | Редактировать файл конфигурации | Open file in external editor. |
-| `` u `` | Проверить обновления |  |
-| `` <enter> `` | Переключиться на последний репозиторий |  |
-| `` a `` | Показать все логи ветки |  |
-
-## Теги
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Переключить | Checkout the selected tag tag as a detached HEAD. |
-| `` n `` | Создать тег | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` d `` | Delete | View delete options for local/remote tag. |
-| `` P `` | Отправить тег | Push the selected tag to a remote. You'll be prompted to select a remote. |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | Просмотреть коммиты |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## Удалённые ветки
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Скопировать название ветки в буфер обмена |  |
-| `` <space> `` | Переключить | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
-| `` n `` | Новая ветка |  |
-| `` M `` | Слияние с текущей переключённой веткой | Merge selected branch into currently checked out branch. |
-| `` r `` | Перебазировать переключённую ветку на эту ветку | Rebase the checked-out branch onto the selected branch. |
-| `` d `` | Delete | Delete the remote branch from the remote. |
-| `` u `` | Set as upstream | Установить как upstream-ветку переключённую ветку |
-| `` s `` | Порядок сортировки |  |
-| `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | Просмотреть коммиты |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## Удалённые репозитории
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | View branches |  |
-| `` n `` | Добавить новую удалённую ветку |  |
-| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
-| `` e `` | Edit | Редактировать удалённый репозитории |
-| `` f `` | Получить изменения | Получение изменения из удалённого репозитория |
-| `` / `` | Filter the current view by text |  |
-
-## Файлы
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | Скопировать название файла в буфер обмена |  |
-| `` <space> `` | Переключить индекс | Toggle staged for selected file. |
-| `` <c-b> `` | Фильтровать файлы (проиндексированные/непроиндексированные) |  |
-| `` y `` | Copy to clipboard |  |
-| `` c `` | Сохранить изменения | Commit staged changes. |
-| `` w `` | Закоммитить изменения без предварительного хука коммита |  |
-| `` A `` | Правка последнего коммита |  |
-| `` C `` | Сохранить изменения с помощью редактора git |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | Edit | Open file in external editor. |
-| `` o `` | Открыть файл | Open file in default application. |
-| `` i `` | Игнорировать или исключить файл |  |
-| `` r `` | Обновить файлы |  |
-| `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
-| `` S `` | Просмотреть параметры хранилища | View stash options (e.g. stash all, stash staged, stash unstaged). |
-| `` a `` | Все проиндексированные/непроиндексированные | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
-| `` d `` | Просмотреть параметры «отмены изменении» | View options for discarding changes to the selected file. |
-| `` g `` | Просмотреть параметры сброса upstream-ветки |  |
-| `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
-| `` ` `` | Переключить вид дерева файлов | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` M `` | Открыть внешний инструмент слияния (git mergetool) | Run `git mergetool`. |
-| `` f `` | Получить изменения | Fetch changes from remote. |
-| `` / `` | Найти |  |
-
-## Хранилище
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | Применить припрятанные изменения | Apply the stash entry to your working directory. |
-| `` g `` | Применить припрятанные изменения и тут же удалить их из хранилища | Apply the stash entry to your working directory and remove the stash entry. |
-| `` d `` | Удалить припрятанные изменения из хранилища | Remove the stash entry from the stash list. |
-| `` n `` | Новая ветка | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
-| `` r `` | Переименовать хранилище |  |
-| `` <enter> `` | Просмотреть файлы выбранного элемента |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |

docs/keybindings/Keybindings_zh-CN.md

@@ -1,364 +0,0 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
-
-# Lazygit 按键绑定
-
-_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
-
-## 全局键绑定
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-r> `` | 切换到最近的仓库 |  |
-| `` <pgup> (fn+up/shift+k) `` | 向上滚动主面板 |  |
-| `` <pgdown> (fn+down/shift+j) `` | 向下滚动主面板 |  |
-| `` @ `` | 打开命令日志菜单 | View options for the command log e.g. show/hide the command log and focus the command log. |
-| `` P `` | 推送 | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` p `` | 拉取 | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` } `` | 扩大差异视图中显示的上下文范围 | Increase the amount of the context shown around changes in the diff view. |
-| `` { `` | 缩小差异视图中显示的上下文范围 | Decrease the amount of the context shown around changes in the diff view. |
-| `` : `` | 执行自定义命令 | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
-| `` <c-p> `` | 查看自定义补丁选项 |  |
-| `` m `` | 查看 合并/变基 选项 | View options to abort/continue/skip the current merge/rebase. |
-| `` R `` | 刷新 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
-| `` + `` | 下一屏模式（正常/半屏/全屏） |  |
-| `` _ `` | 上一屏模式 |  |
-| `` ? `` | 打开菜单 |  |
-| `` <c-s> `` | 查看按路径过滤选项 | View options for filtering the commit log, so that only commits matching the filter are shown. |
-| `` W `` | 打开 diff 菜单 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` <c-e> `` | 打开 diff 菜单 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` q `` | 退出 |  |
-| `` <esc> `` | 取消 |  |
-| `` <c-w> `` | 切换是否在差异视图中显示空白字符差异 | Toggle whether or not whitespace changes are shown in the diff view. |
-| `` z `` | （通过 reflog）撤销「实验功能」 | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
-| `` <c-z> `` | （通过 reflog）重做「实验功能」 | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
-
-## 列表面板导航
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` , `` | 上一页 |  |
-| `` . `` | 下一页 |  |
-| `` < `` | 滚动到顶部 |  |
-| `` > `` | 滚动到底部 |  |
-| `` v `` | 切换拖动选择 |  |
-| `` <s-down> `` | Range select down |  |
-| `` <s-up> `` | Range select up |  |
-| `` / `` | 开始搜索 |  |
-| `` H `` | 向左滚动 |  |
-| `` L `` | 向右滚动 |  |
-| `` ] `` | 下一个标签 |  |
-| `` [ `` | 上一个标签 |  |
-
-## Reflog 页面
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 将提交的 hash 复制到剪贴板 |  |
-| `` <space> `` | 检出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | 在浏览器中打开提交 |  |
-| `` n `` | 从提交创建新分支 |  |
-| `` g `` | 查看重置选项 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 复制提交（拣选） | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | 重置已拣选（复制）的提交 |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | 查看提交 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## Worktrees
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` n `` | New worktree |  |
-| `` <space> `` | Switch | Switch to the selected worktree. |
-| `` o `` | Open in editor |  |
-| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
-| `` / `` | Filter the current view by text |  |
-
-## 分支页面
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 将分支名称复制到剪贴板 |  |
-| `` i `` | 显示 git-flow 选项 |  |
-| `` <space> `` | 检出 | Checkout selected item. |
-| `` n `` | 新分支 |  |
-| `` o `` | 创建抓取请求 |  |
-| `` O `` | 创建抓取请求选项 |  |
-| `` <c-y> `` | 将抓取请求 URL 复制到剪贴板 |  |
-| `` c `` | 按名称检出 | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
-| `` F `` | 强制检出 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | Delete | View delete options for local/remote branch. |
-| `` r `` | 将已检出的分支变基到该分支 | Rebase the checked-out branch onto the selected branch. |
-| `` M `` | 合并到当前检出的分支 | Merge selected branch into currently checked out branch. |
-| `` f `` | 从上游快进此分支 | Fast-forward selected branch from its upstream. |
-| `` T `` | 创建标签 |  |
-| `` s `` | Sort order |  |
-| `` g `` | 查看重置选项 |  |
-| `` R `` | 重命名分支 |  |
-| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
-| `` <enter> `` | 查看提交 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## 子提交
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 将提交的 hash 复制到剪贴板 |  |
-| `` <space> `` | 检出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | 在浏览器中打开提交 |  |
-| `` n `` | 从提交创建新分支 |  |
-| `` g `` | 查看重置选项 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 复制提交（拣选） | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | 重置已拣选（复制）的提交 |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | 查看提交的文件 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | 开始搜索 |  |
-
-## 子模块
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 将子模块名称复制到剪贴板 |  |
-| `` <enter> `` | Enter | 输入子模块 |
-| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
-| `` u `` | Update | 更新子模块 |
-| `` n `` | 添加新的子模块 |  |
-| `` e `` | 更新子模块 URL |  |
-| `` i `` | Initialize | 初始化子模块 |
-| `` b `` | 查看批量子模块选项 |  |
-| `` / `` | Filter the current view by text |  |
-
-## 提交
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 将提交的 hash 复制到剪贴板 |  |
-| `` <c-r> `` | 重置已拣选（复制）的提交 |  |
-| `` b `` | 查看二分查找选项 |  |
-| `` s `` | 压缩 | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | 修正（fixup） | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
-| `` r `` | 改写提交 | Reword the selected commit's message. |
-| `` R `` | 使用编辑器重命名提交 |  |
-| `` d `` | 删除提交 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
-| `` e `` | Edit (start interactive rebase) | 编辑提交 |
-| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
-If you would instead like to start an interactive rebase from the selected commit, press `e`. |
-| `` p `` | Pick | 选择提交（变基过程中） |
-| `` F `` | 为此提交创建修正 | 创建修正提交 |
-| `` S `` | Apply fixup commits | 压缩在所选提交之上的所有“fixup!”提交（自动压缩） |
-| `` <c-j> `` | 下移提交 |  |
-| `` <c-k> `` | 上移提交 |  |
-| `` V `` | 粘贴提交（拣选） |  |
-| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
-| `` A `` | Amend | 用已暂存的更改来修补提交 |
-| `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
-| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | 标签提交 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <c-l> `` | 打开日志菜单 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
-| `` <space> `` | 检出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | 在浏览器中打开提交 |  |
-| `` n `` | 从提交创建新分支 |  |
-| `` g `` | 查看重置选项 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 复制提交（拣选） | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | 查看提交的文件 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | 开始搜索 |  |
-
-## 提交文件
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 将文件名复制到剪贴板 |  |
-| `` c `` | 检出 | 检出文件 |
-| `` d `` | Remove | 放弃对此文件的提交更改 |
-| `` o `` | 打开文件 | Open file in default application. |
-| `` e `` | Edit | Open file in external editor. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <space> `` | 补丁中包含的切换文件 | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | 输入文件以将所选行添加到补丁中（或切换目录折叠） | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
-| `` ` `` | 切换文件树视图 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` / `` | 开始搜索 |  |
-
-## 提交讯息
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 确认 |  |
-| `` <esc> `` | 关闭 |  |
-
-## 文件
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 将文件名复制到剪贴板 |  |
-| `` <space> `` | 切换暂存状态 | Toggle staged for selected file. |
-| `` <c-b> `` | Filter files by status |  |
-| `` y `` | Copy to clipboard |  |
-| `` c `` | 提交更改 | Commit staged changes. |
-| `` w `` | 提交更改而无需预先提交钩子 |  |
-| `` A `` | 修补最后一次提交 |  |
-| `` C `` | 提交更改（使用编辑器编辑提交信息） |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | Edit | Open file in external editor. |
-| `` o `` | 打开文件 | Open file in default application. |
-| `` i `` | 忽略文件 |  |
-| `` r `` | 刷新文件 |  |
-| `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
-| `` S `` | 查看贮藏选项 | View stash options (e.g. stash all, stash staged, stash unstaged). |
-| `` a `` | 切换所有文件的暂存状态 | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | 暂存单个 块/行 用于文件, 或 折叠/展开 目录 | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
-| `` d `` | 查看'放弃更改'选项 | View options for discarding changes to the selected file. |
-| `` g `` | 查看上游重置选项 |  |
-| `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
-| `` ` `` | 切换文件树视图 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` M `` | 打开外部合并工具 (git mergetool) | Run `git mergetool`. |
-| `` f `` | 抓取 | Fetch changes from remote. |
-| `` / `` | 开始搜索 |  |
-
-## 构建补丁中
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | 选择上一个区块 |  |
-| `` <right> `` | 选择下一个区块 |  |
-| `` v `` | 切换拖动选择 |  |
-| `` a `` | 切换选择区块 | Toggle hunk selection mode. |
-| `` <c-o> `` | 将选中文本复制到剪贴板 |  |
-| `` o `` | 打开文件 | Open file in default application. |
-| `` e `` | 编辑文件 | Open file in external editor. |
-| `` <space> `` | 添加/移除 行到补丁 |  |
-| `` <esc> `` | 退出逐行模式 |  |
-| `` / `` | 开始搜索 |  |
-
-## 标签页面
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | 检出 | Checkout the selected tag tag as a detached HEAD. |
-| `` n `` | 创建标签 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` d `` | Delete | View delete options for local/remote tag. |
-| `` P `` | 推送标签 | Push the selected tag to a remote. You'll be prompted to select a remote. |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | 查看提交 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## 正在合并
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | 选中区块 |  |
-| `` b `` | 选中所有区块 |  |
-| `` <up> `` | 选择顶部块 |  |
-| `` <down> `` | 选择底部块 |  |
-| `` <left> `` | 选择上一个冲突 |  |
-| `` <right> `` | 选择下一个冲突 |  |
-| `` z `` | 撤销 | Undo last merge conflict resolution. |
-| `` e `` | 编辑文件 | Open file in external editor. |
-| `` o `` | 打开文件 | Open file in default application. |
-| `` M `` | 打开外部合并工具 (git mergetool) | Run `git mergetool`. |
-| `` <esc> `` | 返回文件面板 |  |
-
-## 正在暂存
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | 选择上一个区块 |  |
-| `` <right> `` | 选择下一个区块 |  |
-| `` v `` | 切换拖动选择 |  |
-| `` a `` | 切换选择区块 | Toggle hunk selection mode. |
-| `` <c-o> `` | 将选中文本复制到剪贴板 |  |
-| `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
-| `` d `` | 取消变更 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` o `` | 打开文件 | Open file in default application. |
-| `` e `` | 编辑文件 | Open file in external editor. |
-| `` <esc> `` | 返回文件面板 |  |
-| `` <tab> `` | 切换到其他面板 | Switch to other view (staged/unstaged changes). |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` c `` | 提交更改 | Commit staged changes. |
-| `` w `` | 提交更改而无需预先提交钩子 |  |
-| `` C `` | 提交更改（使用编辑器编辑提交信息） |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | 开始搜索 |  |
-
-## 正常
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` mouse wheel down (fn+up) `` | 向下滚动 |  |
-| `` mouse wheel up (fn+down) `` | 向上滚动 |  |
-
-## 状态
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` o `` | 打开配置文件 | Open file in default application. |
-| `` e `` | 编辑配置文件 | Open file in external editor. |
-| `` u `` | 检查更新 |  |
-| `` <enter> `` | 切换到最近的仓库 |  |
-| `` a `` | 显示所有分支的日志 |  |
-
-## 确认面板
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 确认 |  |
-| `` <esc> `` | 关闭 |  |
-
-## 菜单
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 执行 |  |
-| `` <esc> `` | 关闭 |  |
-| `` / `` | Filter the current view by text |  |
-
-## 贮藏
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | 应用 | Apply the stash entry to your working directory. |
-| `` g `` | 应用并删除 | Apply the stash entry to your working directory and remove the stash entry. |
-| `` d `` | 删除 | Remove the stash entry from the stash list. |
-| `` n `` | 新分支 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
-| `` r `` | Rename stash |  |
-| `` <enter> `` | 查看提交的文件 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## 远程分支
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 将分支名称复制到剪贴板 |  |
-| `` <space> `` | 检出 | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
-| `` n `` | 新分支 |  |
-| `` M `` | 合并到当前检出的分支 | Merge selected branch into currently checked out branch. |
-| `` r `` | 将已检出的分支变基到该分支 | Rebase the checked-out branch onto the selected branch. |
-| `` d `` | Delete | Delete the remote branch from the remote. |
-| `` u `` | Set as upstream | 设置为检出分支的上游 |
-| `` s `` | Sort order |  |
-| `` g `` | 查看重置选项 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | 查看提交 |  |
-| `` w `` | View worktree options |  |
-| `` / `` | Filter the current view by text |  |
-
-## 远程页面
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | View branches |  |
-| `` n `` | 添加新的远程仓库 |  |
-| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
-| `` e `` | Edit | 编辑远程仓库 |
-| `` f `` | 抓取 | 抓取远程仓库 |
-| `` / `` | Filter the current view by text |  |

docs/keybindings/Keybindings_zh-TW.md

@@ -1,364 +0,0 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
-
-# Lazygit 鍵盤快捷鍵
-
-_說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B_
-
-## 全域快捷鍵
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-r> `` | 切換到最近使用的版本庫 |  |
-| `` <pgup> (fn+up/shift+k) `` | 向上捲動主面板 |  |
-| `` <pgdown> (fn+down/shift+j) `` | 向下捲動主面板 |  |
-| `` @ `` | 開啟命令記錄選單 | View options for the command log e.g. show/hide the command log and focus the command log. |
-| `` P `` | 推送 | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` p `` | 拉取 | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
-| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | Increase the amount of the context shown around changes in the diff view. |
-| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | Decrease the amount of the context shown around changes in the diff view. |
-| `` : `` | 執行自訂命令 | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
-| `` <c-p> `` | 檢視自訂補丁選項 |  |
-| `` m `` | 查看合併/變基選項 | View options to abort/continue/skip the current merge/rebase. |
-| `` R `` | 重新整理 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
-| `` + `` | 下一個螢幕模式（常規/半螢幕/全螢幕） |  |
-| `` _ `` | 上一個螢幕模式 |  |
-| `` ? `` | 開啟選單 |  |
-| `` <c-s> `` | 檢視篩選路徑選項 | View options for filtering the commit log, so that only commits matching the filter are shown. |
-| `` W `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` <c-e> `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
-| `` q `` | 結束 |  |
-| `` <esc> `` | 取消 |  |
-| `` <c-w> `` | 切換是否在差異檢視中顯示空格變更 | Toggle whether or not whitespace changes are shown in the diff view. |
-| `` z `` | 復原 | 將使用 reflog 確任 git 指令以復原。這不包括工作區更改；只考慮提交。 |
-| `` <c-z> `` | 取消復原 | 將使用 reflog 確任 git 指令以重作。這不包括工作區更改；只考慮提交。 |
-
-## 移動
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` , `` | 上一頁 |  |
-| `` . `` | 下一頁 |  |
-| `` < `` | 捲動到頂部 |  |
-| `` > `` | 捲動到底部 |  |
-| `` v `` | 切換拖曳選擇 |  |
-| `` <s-down> `` | Range select down |  |
-| `` <s-up> `` | Range select up |  |
-| `` / `` | 搜尋 |  |
-| `` H `` | 向左捲動 |  |
-| `` L `` | 向右捲動 |  |
-| `` ] `` | 下一個索引標籤 |  |
-| `` [ `` | 上一個索引標籤 |  |
-
-## 主面板 (補丁生成)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | 選擇上一段 |  |
-| `` <right> `` | 選擇下一段 |  |
-| `` v `` | 切換拖曳選擇 |  |
-| `` a `` | 切換選擇程式碼塊 | Toggle hunk selection mode. |
-| `` <c-o> `` | 複製所選文本至剪貼簿 |  |
-| `` o `` | 開啟檔案 | Open file in default application. |
-| `` e `` | 編輯檔案 | Open file in external editor. |
-| `` <space> `` | 向 (或從) 補丁中添加/刪除行 |  |
-| `` <esc> `` | 退出自訂補丁建立器 |  |
-| `` / `` | 搜尋 |  |
-
-## 主面板（一般）
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` mouse wheel down (fn+up) `` | 向下捲動 |  |
-| `` mouse wheel up (fn+down) `` | 向上捲動 |  |
-
-## 主面板（合併）
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | 挑選程式碼片段 |  |
-| `` b `` | 挑選所有程式碼片段 |  |
-| `` <up> `` | 選擇上一段 |  |
-| `` <down> `` | 選擇下一段 |  |
-| `` <left> `` | 選擇上一個衝突 |  |
-| `` <right> `` | 選擇下一個衝突 |  |
-| `` z `` | 復原 | Undo last merge conflict resolution. |
-| `` e `` | 編輯檔案 | Open file in external editor. |
-| `` o `` | 開啟檔案 | Open file in default application. |
-| `` M `` | 開啟外部合併工具 (git mergetool) | Run `git mergetool`. |
-| `` <esc> `` | 返回檔案面板 |  |
-
-## 主面板（預存）
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left> `` | 選擇上一段 |  |
-| `` <right> `` | 選擇下一段 |  |
-| `` v `` | 切換拖曳選擇 |  |
-| `` a `` | 切換選擇程式碼塊 | Toggle hunk selection mode. |
-| `` <c-o> `` | 複製所選文本至剪貼簿 |  |
-| `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
-| `` d `` | 刪除變更 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` o `` | 開啟檔案 | Open file in default application. |
-| `` e `` | 編輯檔案 | Open file in external editor. |
-| `` <esc> `` | 返回檔案面板 |  |
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
-| `` E `` | 編輯程式碼塊 | Edit selected hunk in external editor. |
-| `` c `` | 提交變更 | Commit staged changes. |
-| `` w `` | 沒有預提交 hook 就提交更改 |  |
-| `` C `` | 使用 git 編輯器提交變更 |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | 搜尋 |  |
-
-## 功能表
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 執行 |  |
-| `` <esc> `` | 關閉 |  |
-| `` / `` | 搜尋 |  |
-
-## 子提交
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 複製提交 hash 到剪貼簿 |  |
-| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | 在瀏覽器中開啟提交 |  |
-| `` n `` | 從提交建立新分支 |  |
-| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | 重設選定的揀選 (複製) 提交 |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | 檢視所選項目的檔案 |  |
-| `` w `` | 檢視工作目錄選項 |  |
-| `` / `` | 搜尋 |  |
-
-## 子模組
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 複製子模組名稱到剪貼簿 |  |
-| `` <enter> `` | Enter | 進入子模組 |
-| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
-| `` u `` | Update | 更新子模組 |
-| `` n `` | 新增子模組 |  |
-| `` e `` | 更新子模組 URL |  |
-| `` i `` | Initialize | 初始化子模組 |
-| `` b `` | 查看批量子模組選項 |  |
-| `` / `` | 搜尋 |  |
-
-## 工作目錄
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` n `` | New worktree |  |
-| `` <space> `` | Switch | Switch to the selected worktree. |
-| `` o `` | Open in editor |  |
-| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
-| `` / `` | 搜尋 |  |
-
-## 提交
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 複製提交 hash 到剪貼簿 |  |
-| `` <c-r> `` | 重設選定的揀選 (複製) 提交 |  |
-| `` b `` | 查看二分選項 |  |
-| `` s `` | 壓縮 (Squash) | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | 修復 (Fixup) | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
-| `` r `` | 改寫提交 | Reword the selected commit's message. |
-| `` R `` | 使用編輯器改寫提交 |  |
-| `` d `` | 刪除提交 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
-| `` e `` | Edit (start interactive rebase) | 編輯提交 |
-| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
-If you would instead like to start an interactive rebase from the selected commit, press `e`. |
-| `` p `` | Pick | 挑選提交 (於變基過程中) |
-| `` F `` | 建立修復提交 | 為此提交建立修復提交 |
-| `` S `` | 壓縮上方所有「fixup」提交（自動壓縮） | 是否壓縮上方 {{.commit}} 所有「fixup」提交？ |
-| `` <c-j> `` | 向下移動提交 |  |
-| `` <c-k> `` | 向上移動提交 |  |
-| `` V `` | 貼上提交 (揀選) |  |
-| `` B `` | 為了變基已標注提交為基準提交 | 請為了下一次變基選擇一項基準提交；此將執行 `git rebase --onto`。 |
-| `` A `` | Amend | 使用已預存的更改修正提交 |
-| `` a `` | 設定/重設提交作者 | Set/Reset commit author or set co-author. |
-| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | 打標籤到提交 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <c-l> `` | 開啟記錄選單 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
-| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | 在瀏覽器中開啟提交 |  |
-| `` n `` | 從提交建立新分支 |  |
-| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | 檢視所選項目的檔案 |  |
-| `` w `` | 檢視工作目錄選項 |  |
-| `` / `` | 搜尋 |  |
-
-## 提交摘要
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 確認 |  |
-| `` <esc> `` | 關閉 |  |
-
-## 提交檔案
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 複製檔案名稱到剪貼簿 |  |
-| `` c `` | 檢出 | 檢出檔案 |
-| `` d `` | Remove | Discard this commit's changes to this file. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes this file. |
-| `` o `` | 開啟檔案 | Open file in default application. |
-| `` e `` | Edit | Open file in external editor. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <space> `` | 切換檔案是否包含在補丁中 | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` a `` | 切換所有檔案是否包含在補丁中 | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
-| `` ` `` | 顯示檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` / `` | 搜尋 |  |
-
-## 收藏 (Stash)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | 套用 | Apply the stash entry to your working directory. |
-| `` g `` | 還原 | Apply the stash entry to your working directory and remove the stash entry. |
-| `` d `` | 捨棄 | Remove the stash entry from the stash list. |
-| `` n `` | 新分支 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
-| `` r `` | 重新命名收藏 |  |
-| `` <enter> `` | 檢視所選項目的檔案 |  |
-| `` w `` | 檢視工作目錄選項 |  |
-| `` / `` | 搜尋 |  |
-
-## 日誌
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 複製提交 hash 到剪貼簿 |  |
-| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
-| `` o `` | 在瀏覽器中開啟提交 |  |
-| `` n `` | 從提交建立新分支 |  |
-| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
-| `` <c-r> `` | 重設選定的揀選 (複製) 提交 |  |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` <enter> `` | 檢視提交 |  |
-| `` w `` | 檢視工作目錄選項 |  |
-| `` / `` | 搜尋 |  |
-
-## 本地分支
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 複製分支名稱到剪貼簿 |  |
-| `` i `` | 顯示 git-flow 選項 |  |
-| `` <space> `` | 檢出 | Checkout selected item. |
-| `` n `` | 新分支 |  |
-| `` o `` | 建立拉取請求 |  |
-| `` O `` | 建立拉取請求選項 |  |
-| `` <c-y> `` | 複製拉取請求的 URL 到剪貼板 |  |
-| `` c `` | 根據名稱檢出 | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
-| `` F `` | 強制檢出 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | Delete | View delete options for local/remote branch. |
-| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
-| `` M `` | 合併到當前檢出的分支 | Merge selected branch into currently checked out branch. |
-| `` f `` | 從上游快進此分支 | Fast-forward selected branch from its upstream. |
-| `` T `` | 建立標籤 |  |
-| `` s `` | Sort order |  |
-| `` g `` | 檢視重設選項 |  |
-| `` R `` | 重新命名分支 |  |
-| `` u `` | 檢視上游設定 | 檢視有關上游分支的設定（例如重設至上游） |
-| `` <enter> `` | 檢視提交 |  |
-| `` w `` | 檢視工作目錄選項 |  |
-| `` / `` | 搜尋 |  |
-
-## 標籤
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <space> `` | 檢出 | Checkout the selected tag tag as a detached HEAD. |
-| `` n `` | 建立標籤 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` d `` | Delete | View delete options for local/remote tag. |
-| `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. |
-| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | 檢視提交 |  |
-| `` w `` | 檢視工作目錄選項 |  |
-| `` / `` | 搜尋 |  |
-
-## 檔案
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 複製檔案名稱到剪貼簿 |  |
-| `` <space> `` | 切換預存 | Toggle staged for selected file. |
-| `` <c-b> `` | 篩選檔案 (預存/未預存) |  |
-| `` y `` | Copy to clipboard |  |
-| `` c `` | 提交變更 | Commit staged changes. |
-| `` w `` | 沒有預提交 hook 就提交更改 |  |
-| `` A `` | 修改上次提交 |  |
-| `` C `` | 使用 git 編輯器提交變更 |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | Edit | Open file in external editor. |
-| `` o `` | 開啟檔案 | Open file in default application. |
-| `` i `` | 忽略或排除檔案 |  |
-| `` r `` | 重新整理檔案 |  |
-| `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
-| `` S `` | 檢視收藏選項 | View stash options (e.g. stash all, stash staged, stash unstaged). |
-| `` a `` | 全部預存/取消預存 | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
-| `` d `` | Discard | View options for discarding changes to the selected file. |
-| `` g `` | 檢視上游重設選項 |  |
-| `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
-| `` ` `` | 顯示檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
-| `` <c-t> `` | Open external diff tool (git difftool) |  |
-| `` M `` | 開啟外部合併工具 (git mergetool) | Run `git mergetool`. |
-| `` f `` | 擷取 | Fetch changes from remote. |
-| `` / `` | 搜尋 |  |
-
-## 狀態
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` o `` | 開啟設定檔案 | Open file in default application. |
-| `` e `` | 編輯設定檔案 | Open file in external editor. |
-| `` u `` | 檢查更新 |  |
-| `` <enter> `` | 切換到最近使用的版本庫 |  |
-| `` a `` | 顯示所有分支日誌 |  |
-
-## 確認面板
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 確認 |  |
-| `` <esc> `` | 關閉/取消 |  |
-
-## 遠端
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | View branches |  |
-| `` n `` | 新增遠端 |  |
-| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
-| `` e `` | Edit | 編輯遠端 |
-| `` f `` | 擷取 | 擷取遠端 |
-| `` / `` | 搜尋 |  |
-
-## 遠端分支
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <c-o> `` | 複製分支名稱到剪貼簿 |  |
-| `` <space> `` | 檢出 | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
-| `` n `` | 新分支 |  |
-| `` M `` | 合併到當前檢出的分支 | Merge selected branch into currently checked out branch. |
-| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
-| `` d `` | Delete | Delete the remote branch from the remote. |
-| `` u `` | Set as upstream | 將此分支設為當前分支之上游 |
-| `` s `` | Sort order |  |
-| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <enter> `` | 檢視提交 |  |
-| `` w `` | 檢視工作目錄選項 |  |
-| `` / `` | 搜尋 |  |

docs/keybindings/Keybindings_zh.md

@@ -0,0 +1,307 @@
+# This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root.
+
+# Lazygit 按键绑定
+
+## 全局键绑定
+
+<pre>
+  <kbd>ctrl+r</kbd>: 切换到最近的仓库 (<c-r>)
+  <kbd>pgup</kbd>: 向上滚动主面板 (fn+up)
+  <kbd>pgdown</kbd>: 向下滚动主面板 (fn+down)
+  <kbd>m</kbd>: 查看 合并/变基 选项
+  <kbd>ctrl+p</kbd>: 查看自定义补丁选项
+  <kbd>P</kbd>: 推送
+  <kbd>p</kbd>: 拉取
+  <kbd>R</kbd>: 刷新
+  <kbd>x</kbd>: 打开菜单
+  <kbd>z</kbd>: （通过 reflog）撤销「实验功能」
+  <kbd>ctrl+z</kbd>: （通过 reflog）重做「实验功能」
+  <kbd>+</kbd>: 下一屏模式（正常/半屏/全屏）
+  <kbd>_</kbd>: 上一屏模式
+  <kbd>:</kbd>: 执行自定义命令
+  <kbd>ctrl+s</kbd>: 查看按路径过滤选项
+  <kbd>W</kbd>: 打开 diff 菜单
+  <kbd>ctrl+e</kbd>: 打开 diff 菜单
+  <kbd>@</kbd>: 打开命令日志菜单
+  <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
+  <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
+</pre>
+
+## 列表面板导航
+
+<pre>
+  <kbd>.</kbd>: 下一页
+  <kbd>,</kbd>: 上一页
+  <kbd><</kbd>: 滚动到顶部
+  <kbd>></kbd>: 滚动到底部
+  <kbd>/</kbd>: 开始搜索
+  <kbd>]</kbd>: 下一个标签
+  <kbd>[</kbd>: 上一个标签
+</pre>
+
+## 分支 面板 (分支标签)
+
+<pre>
+  <kbd>space</kbd>: 检出
+  <kbd>o</kbd>: 创建抓取请求
+  <kbd>O</kbd>: 创建抓取请求选项
+  <kbd>ctrl+y</kbd>: 将抓取请求 URL 复制到剪贴板
+  <kbd>c</kbd>: 按名称检出
+  <kbd>F</kbd>: 强制检出
+  <kbd>n</kbd>: 新分支
+  <kbd>d</kbd>: 删除分支
+  <kbd>r</kbd>: 将已检出的分支变基到该分支
+  <kbd>M</kbd>: 合并到当前检出的分支
+  <kbd>i</kbd>: 显示 git-flow 选项
+  <kbd>f</kbd>: 从上游快进此分支
+  <kbd>g</kbd>: 查看重置选项
+  <kbd>R</kbd>: 重命名分支
+  <kbd>ctrl+o</kbd>: 将分支名称复制到剪贴板
+  <kbd>enter</kbd>: 查看提交
+</pre>
+
+## 分支 面板 (远程分支（在远程页面中）)
+
+<pre>
+  <kbd>esc</kbd>: 返回远程仓库列表
+  <kbd>g</kbd>: 查看重置选项
+  <kbd>enter</kbd>: 查看提交
+  <kbd>space</kbd>: 检出
+  <kbd>n</kbd>: 新分支
+  <kbd>M</kbd>: 合并到当前检出的分支
+  <kbd>d</kbd>: 删除分支
+  <kbd>r</kbd>: 将已检出的分支变基到该分支
+  <kbd>u</kbd>: 设置为检出分支的上游
+</pre>
+
+## 分支 面板 (远程页面)
+
+<pre>
+  <kbd>f</kbd>: 抓取远程仓库
+  <kbd>n</kbd>: 添加新的远程仓库
+  <kbd>d</kbd>: 删除远程
+  <kbd>e</kbd>: 编辑远程仓库
+</pre>
+
+## 分支 面板 (子提交)
+
+<pre>
+  <kbd>enter</kbd>: 查看提交的文件
+  <kbd>space</kbd>: 检出提交
+  <kbd>g</kbd>: 查看重置选项
+  <kbd>n</kbd>: 新分支
+  <kbd>c</kbd>: 复制提交（拣选）
+  <kbd>C</kbd>: 复制提交范围（拣选）
+  <kbd>ctrl+r</kbd>: 重置已拣选（复制）的提交
+  <kbd>ctrl+o</kbd>: 将提交的 SHA 复制到剪贴板
+</pre>
+
+## 分支 面板 (标签页面)
+
+<pre>
+  <kbd>space</kbd>: 检出
+  <kbd>d</kbd>: 删除标签
+  <kbd>P</kbd>: 推送标签
+  <kbd>n</kbd>: 创建标签
+  <kbd>g</kbd>: 查看重置选项
+  <kbd>enter</kbd>: 查看提交
+</pre>
+
+## 提交文件 面板
+
+<pre>
+  <kbd>ctrl+o</kbd>: 将提交的文件名复制到剪贴板
+  <kbd>c</kbd>: 检出文件
+  <kbd>d</kbd>: 放弃对此文件的提交更改
+  <kbd>o</kbd>: 打开文件
+  <kbd>e</kbd>: 编辑文件
+  <kbd>space</kbd>: 补丁中包含的切换文件
+  <kbd>enter</kbd>: 输入文件以将所选行添加到补丁中（或切换目录折叠）
+  <kbd>`</kbd>: 切换文件树视图
+</pre>
+
+## 提交 面板 (提交)
+
+<pre>
+  <kbd>ctrl+l</kbd>: open log menu
+  <kbd>s</kbd>: 向下压缩
+  <kbd>r</kbd>: 改写提交
+  <kbd>R</kbd>: 使用编辑器重命名提交
+  <kbd>g</kbd>: 重置为此提交
+  <kbd>f</kbd>: 修正提交（fixup）
+  <kbd>F</kbd>: 为此提交创建修正
+  <kbd>S</kbd>: 压缩在所选提交之上的所有“fixup!”提交（自动压缩）
+  <kbd>d</kbd>: 删除提交
+  <kbd>ctrl+j</kbd>: 下移提交
+  <kbd>ctrl+k</kbd>: 上移提交
+  <kbd>e</kbd>: 编辑提交
+  <kbd>A</kbd>: 用已暂存的更改来修补提交
+  <kbd>p</kbd>: 选择提交（变基过程中）
+  <kbd>t</kbd>: 还原提交
+  <kbd>c</kbd>: 复制提交（拣选）
+  <kbd>ctrl+o</kbd>: 将提交的 SHA 复制到剪贴板
+  <kbd>C</kbd>: 复制提交范围（拣选）
+  <kbd>v</kbd>: 粘贴提交（拣选）
+  <kbd>enter</kbd>: 查看提交的文件
+  <kbd>space</kbd>: 检出提交
+  <kbd>n</kbd>: 从提交创建新分支
+  <kbd>T</kbd>: 标签提交
+  <kbd>ctrl+r</kbd>: 重置已拣选（复制）的提交
+  <kbd>ctrl+y</kbd>: 将提交消息复制到剪贴板
+  <kbd>o</kbd>: open commit in browser
+</pre>
+
+## 提交 面板 (Reflog)
+
+<pre>
+  <kbd>enter</kbd>: 查看提交的文件
+  <kbd>space</kbd>: 检出提交
+  <kbd>g</kbd>: 查看重置选项
+  <kbd>c</kbd>: 复制提交（拣选）
+  <kbd>C</kbd>: 复制提交范围（拣选）
+  <kbd>ctrl+r</kbd>: 重置已拣选（复制）的提交
+  <kbd>ctrl+o</kbd>: 将提交的 SHA 复制到剪贴板
+</pre>
+
+## Extras 面板
+
+<pre>
+  <kbd>@</kbd>: 打开命令日志菜单
+</pre>
+
+## 文件 面板
+
+<pre>
+  <kbd>ctrl+b</kbd>: 过滤提交文件
+</pre>
+
+## 文件 面板 (文件)
+
+<pre>
+  <kbd>c</kbd>: 提交更改
+  <kbd>w</kbd>: 提交更改而无需预先提交钩子
+  <kbd>A</kbd>: 修补最后一次提交
+  <kbd>C</kbd>: 提交更改（使用编辑器编辑提交信息）
+  <kbd>space</kbd>: 切换暂存状态
+  <kbd>d</kbd>: 查看'放弃更改‘选项
+  <kbd>e</kbd>: 编辑文件
+  <kbd>o</kbd>: 打开文件
+  <kbd>i</kbd>: 添加到 .gitignore
+  <kbd>r</kbd>: 刷新文件
+  <kbd>s</kbd>: 将所有更改加入贮藏
+  <kbd>S</kbd>: 查看隐藏选项
+  <kbd>a</kbd>: 切换所有文件的暂存状态
+  <kbd>D</kbd>: 查看重置选项
+  <kbd>enter</kbd>: 暂存单个 块/行 用于文件, 或 折叠/展开 目录
+  <kbd>f</kbd>: 抓取
+  <kbd>ctrl+o</kbd>: 将文件名复制到剪贴板
+  <kbd>g</kbd>: 查看上游重置选项
+  <kbd>`</kbd>: 切换文件树视图
+  <kbd>M</kbd>: 打开合并工具
+  <kbd>ctrl+w</kbd>: 切换是否在差异视图中显示空白更改
+</pre>
+
+## 文件 面板 (子模块)
+
+<pre>
+  <kbd>ctrl+o</kbd>: 将子模块名称复制到剪贴板
+  <kbd>enter</kbd>: 输入子模块
+  <kbd>d</kbd>: 查看重置和删除子模块选项
+  <kbd>u</kbd>: 更新子模块
+  <kbd>n</kbd>: 添加新的子模块
+  <kbd>e</kbd>: 更新子模块 URL
+  <kbd>i</kbd>: 初始化子模块
+  <kbd>b</kbd>: 查看批量子模块选项
+</pre>
+
+## 主要 面板 (合并中)
+
+<pre>
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>esc</kbd>: 返回文件面板
+  <kbd>M</kbd>: 打开合并工具
+  <kbd>space</kbd>: 选中区块
+  <kbd>b</kbd>: 选中所有区块
+  <kbd>◄</kbd>: 选择上一个冲突
+  <kbd>►</kbd>: 选择下一个冲突
+  <kbd>▲</kbd>: 选择顶部块
+  <kbd>▼</kbd>: 选择底部块
+  <kbd>z</kbd>: 撤销
+</pre>
+
+## 主要 面板 (正常)
+
+<pre>
+  <kbd>Ő</kbd>: 向下滚动 (fn+up)
+  <kbd>ő</kbd>: 向上滚动 (fn+down)
+</pre>
+
+## 主要 面板 (构建补丁中)
+
+<pre>
+  <kbd>esc</kbd>: 退出逐行模式
+  <kbd>o</kbd>: 打开文件
+  <kbd>▲</kbd>: 选择上一行
+  <kbd>▼</kbd>: 选择下一行
+  <kbd>◄</kbd>: 选择上一个区块
+  <kbd>►</kbd>: 选择下一个区块
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>space</kbd>: 添加/移除 行到补丁
+  <kbd>v</kbd>: 切换拖动选择
+  <kbd>V</kbd>: 切换拖动选择
+  <kbd>a</kbd>: 切换选择区块
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+</pre>
+
+## 主要 面板 (正在暂存)
+
+<pre>
+  <kbd>esc</kbd>: 返回文件面板
+  <kbd>space</kbd>: 切换行暂存状态
+  <kbd>d</kbd>: 取消变更 (git reset)
+  <kbd>tab</kbd>: 切换到其他面板
+  <kbd>o</kbd>: 打开文件
+  <kbd>▲</kbd>: 选择上一行
+  <kbd>▼</kbd>: 选择下一行
+  <kbd>◄</kbd>: 选择上一个区块
+  <kbd>►</kbd>: 选择下一个区块
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>e</kbd>: 编辑文件
+  <kbd>o</kbd>: 打开文件
+  <kbd>v</kbd>: 切换拖动选择
+  <kbd>V</kbd>: 切换拖动选择
+  <kbd>a</kbd>: 切换选择区块
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>c</kbd>: 提交更改
+  <kbd>w</kbd>: 提交更改而无需预先提交钩子
+  <kbd>C</kbd>: 提交更改（使用编辑器编辑提交信息）
+</pre>
+
+## 菜单 面板
+
+<pre>
+  <kbd>esc</kbd>: 关闭菜单
+</pre>
+
+## 贮藏 面板
+
+<pre>
+  <kbd>enter</kbd>: 查看贮藏条目中的文件
+  <kbd>space</kbd>: 应用
+  <kbd>g</kbd>: 应用并删除
+  <kbd>d</kbd>: 删除
+  <kbd>n</kbd>: 新分支
+</pre>
+
+## 状态 面板
+
+<pre>
+  <kbd>e</kbd>: 编辑配置文件
+  <kbd>o</kbd>: 打开配置文件
+  <kbd>u</kbd>: 检查更新
+  <kbd>enter</kbd>: 切换到最近的仓库
+  <kbd>a</kbd>: 显示所有分支的日志
+</pre>

go.mod

@@ -1,82 +1,48 @@
 module github.com/jesseduffield/lazygit
 
-go 1.22
+go 1.14
 
 require (
-	github.com/adrg/xdg v0.4.0
-	github.com/atotto/clipboard v0.1.4
+	github.com/OpenPeeDeeP/xdg v1.0.0
+	github.com/atotto/clipboard v0.1.2
 	github.com/aybabtme/humanlog v0.4.1
+	github.com/cli/safeexec v1.0.0
 	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
 	github.com/creack/pty v1.1.11
-	github.com/gdamore/tcell/v2 v2.7.4
-	github.com/go-errors/errors v1.5.1
+	github.com/fatih/color v1.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.4.7
+	github.com/go-errors/errors v1.4.1
+	github.com/go-logfmt/logfmt v0.5.0 // indirect
+	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
+	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/gookit/color v1.4.2
-	github.com/iancoleman/orderedmap v0.3.0
 	github.com/imdario/mergo v0.3.11
 	github.com/integrii/flaggy v1.4.0
-	github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68
-	github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d
-	github.com/jesseduffield/gocui v0.3.1-0.20240418080333-8cd33929c513
-	github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10
-	github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
+	github.com/jesseduffield/go-git/v5 v5.1.2-0.20201006095850-341962be15a4
+	github.com/jesseduffield/gocui v0.3.1-0.20220108045521-1945d7b9ed8b
 	github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e
+	github.com/jesseduffield/yaml v2.1.0+incompatible
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
-	github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/kyokomi/emoji/v2 v2.2.8
 	github.com/lucasb-eyer/go-colorful v1.2.0
-	github.com/mattn/go-runewidth v0.0.15
-	github.com/mgutz/str v1.2.0
-	github.com/mitchellh/go-ps v1.0.0
-	github.com/sahilm/fuzzy v0.1.0
-	github.com/samber/lo v1.31.0
-	github.com/sanity-io/litter v1.5.2
-	github.com/sasha-s/go-deadlock v0.3.1
-	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/afero v1.9.5
-	github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
-	github.com/stefanhaller/git-todo-parser v0.0.7-0.20240406123903-fd957137b6e2
-	github.com/stretchr/testify v1.8.1
-	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778
-	golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8
-	golang.org/x/sync v0.7.0
-	gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0
-	gopkg.in/yaml.v3 v3.0.1
-)
-
-require (
-	github.com/bahlo/generic-list-go v0.2.0 // indirect
-	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emirpasic/gods v1.12.0 // indirect
-	github.com/fatih/color v1.9.0 // indirect
-	github.com/gdamore/encoding v1.0.1 // indirect
-	github.com/go-git/gcfg v1.5.0 // indirect
-	github.com/go-git/go-billy/v5 v5.0.0 // indirect
-	github.com/go-logfmt/logfmt v0.5.0 // indirect
-	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
-	github.com/invopop/jsonschema v0.10.0 // indirect
-	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
-	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.11 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mattn/go-runewidth v0.0.13
+	github.com/mgutz/str v1.2.0
 	github.com/onsi/ginkgo v1.10.3 // indirect
 	github.com/onsi/gomega v1.7.1 // indirect
-	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
-	github.com/xanzy/ssh-agent v0.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/term v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	gopkg.in/warnings.v0 v0.1.2 // indirect
+	github.com/pmezard/go-difflib v1.0.0
+	github.com/sahilm/fuzzy v0.1.0
+	github.com/sirupsen/logrus v1.4.2
+	github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
+	github.com/stretchr/testify v1.7.0
+	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778
+	golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
+	golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0
 )

go.sum

@@ -1,216 +1,90 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
-github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
+github.com/OpenPeeDeeP/xdg v1.0.0 h1:UDLmNjCGFZZCaVMB74DqYEtXkHxnTxcr4FeJVF9uCn8=
+github.com/OpenPeeDeeP/xdg v1.0.0/go.mod h1:tMoSueLQlMf0TCldjrJLNIjAc5qAOIcHt5REi88/Ygo=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
-github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
+github.com/atotto/clipboard v0.1.2 h1:YZCtFu5Ie8qX2VmVTBnrqLSiU9XOWwqNRmdT3gIQzbY=
+github.com/atotto/clipboard v0.1.2/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/aybabtme/humanlog v0.4.1 h1:D8d9um55rrthJsP8IGSHBcti9lTb/XknmDAX6Zy8tek=
 github.com/aybabtme/humanlog v0.4.1/go.mod h1:B0bnQX4FTSU3oftPMTTPvENCy8LqixLDvYJA9TUCAGo=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
-github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
-github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
-github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
-github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI=
+github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q=
 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuijfIjZyjZaHq9xDUh0tNitwXshJpbLkqMOJv4H3do=
 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.1-0.20180516100307-2d684516a886/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
-github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
-github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
-github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU=
-github.com/gdamore/tcell/v2 v2.7.4/go.mod h1:dSXtXTSK0VsW1biw65DZLZ2NKr7j0qP/0J7ONmsraWg=
+github.com/gdamore/tcell/v2 v2.4.0 h1:W6dxJEmaxYvhICFoTY3WrLLEXsQ11SaFnKGVEXW57KM=
+github.com/gdamore/tcell/v2 v2.4.0/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU=
 github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
-github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
-github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
+github.com/go-errors/errors v1.4.1 h1:IvVlgbzSsaUNudsw5dcXSzF3EWyXTi5XrAdngnuhRyg=
+github.com/go-errors/errors v1.4.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
 github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
 github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM=
 github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
 github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbKy9zOy4aAKrJ5pibIRpVO2BXnK1Tlcg+caKI7Ox5M=
 github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 h1:zN2lZNZRflqFyxVaTIU61KNKQ9C0055u9CAfpmqUvo4=
+github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod h1:nPpo7qLxd6XL3hWJG/O60sR8ZKfMCiIoNap5GvD12KU=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk=
 github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc=
-github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/integrii/flaggy v1.4.0 h1:A1x7SYx4jqu5NSrY14z8Z+0UyX2S5ygfJJrfolWR3zM=
 github.com/integrii/flaggy v1.4.0/go.mod h1:tnTxHeTJbah0gQ6/K0RW0J7fMUBk9MCF5blhm43LNpI=
-github.com/invopop/jsonschema v0.10.0 h1:c1ktzNLBun3LyQQhyty5WE3lulbOdIIyOVlkmDLehcE=
-github.com/invopop/jsonschema v0.10.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8TIcC6Y4RI+1ZbJDOHfGJ570tPeYVCqo7/tws=
-github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68/go.mod h1:+LLj9/WUPAP8LqCchs7P+7X0R98HiFujVFANdNaxhGk=
-github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d h1:bO+OmbreIv91rCe8NmscRwhFSqkDJtzWCPV4Y+SQuXE=
-github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o=
-github.com/jesseduffield/gocui v0.3.1-0.20240418080333-8cd33929c513 h1:Y1bw5iItrsDCumATc/rklIJ/6K+68ieiWZJedhrNuXo=
-github.com/jesseduffield/gocui v0.3.1-0.20240418080333-8cd33929c513/go.mod h1:XtEbqCbn45keRXEu+OMZkjN5gw6AEob59afsgHjokZ8=
-github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 h1:jmpr7KpX2+2GRiE91zTgfq49QvgiqB0nbmlwZ8UnOx0=
-github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10/go.mod h1:aA97kHeNA+sj2Hbki0pvLslmE4CbDyhBeSSTUUnOuVo=
-github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY=
-github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5/go.mod h1:qxN4mHOAyeIDLP7IK7defgPClM/z1Kze8VVQiaEjzsQ=
+github.com/jesseduffield/go-git/v5 v5.1.2-0.20201006095850-341962be15a4 h1:GOQrmaE8i+KEdB8NzAegKYd4tPn/inM0I1uo0NXFerg=
+github.com/jesseduffield/go-git/v5 v5.1.2-0.20201006095850-341962be15a4/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o=
+github.com/jesseduffield/gocui v0.3.1-0.20220108045521-1945d7b9ed8b h1:AUK5nDiPiaahBtGIsf8rITgZ9SC+uddvnNKs0/mrYA8=
+github.com/jesseduffield/gocui v0.3.1-0.20220108045521-1945d7b9ed8b/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU=
 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e h1:uw/oo+kg7t/oeMs6sqlAwr85ND/9cpO3up3VxphxY0U=
 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e/go.mod h1:u60qdFGXRd36jyEXxetz0vQceQIxzI13lIo3EFUDf4I=
+github.com/jesseduffield/yaml v2.1.0+incompatible h1:HWQJ1gIv2zHKbDYNp0Jwjlj24K8aqpFHnMCynY1EpmE=
+github.com/jesseduffield/yaml v2.1.0+incompatible/go.mod h1:w0xGhOSIJCGYYW+hnFPTutCy5aACpkcwbmORt5axGqk=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
-github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3 h1:s995u+gNQADMaixtNOs+jilRC/Q78q0UXSI7+4T0cDE=
-github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3/go.mod h1:MCbEh21gjOzxc31udr3u4QM9DAdf8TFJCZz3u5hYIxA=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -222,10 +96,9 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/kyokomi/emoji/v2 v2.2.8 h1:jcofPxjHWEkJtkIbcLHvZhxKgCPl6C7MyjTrD4KDqUE=
 github.com/kyokomi/emoji/v2 v2.2.8/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE=
+github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
@@ -235,14 +108,13 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mgutz/str v1.2.0 h1:4IzWSdIz9qPQWLfKZ0rJcV0jcUDpxvP4JVZ4GXQyvSw=
 github.com/mgutz/str v1.2.0/go.mod h1:w1v0ofgLaJdoD0HpQ3fycxKD1WtxpjSo151pK/31q6w=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
-github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -250,399 +122,77 @@ github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
-github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
-github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
 github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
-github.com/samber/lo v1.31.0 h1:Sfa+/064Tdo4SvlohQUQzBhgSer9v/coGvKQI/XLWAM=
-github.com/samber/lo v1.31.0/go.mod h1:HLeWcJRRyLKp3+/XBJvOrerCQn9mhdKMHyd7IRlgeQ8=
-github.com/sanity-io/litter v1.5.2 h1:AnC8s9BMORWH5a4atZ4D6FPVvKGzHcnc5/IVTa87myw=
-github.com/sanity-io/litter v1.5.2/go.mod h1:5Z71SvaYy5kcGtyglXOC9rrUi3c1E8CamFWjQsazTh0=
-github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
-github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
-github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad h1:fiWzISvDn0Csy5H0iwgAuJGQTUpVfEMJJd4nRFXogbc=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
-github.com/stefanhaller/git-todo-parser v0.0.7-0.20240406123903-fd957137b6e2 h1:RTNWemd/9z9A5L/AggEP3OdhRz5dXETB/wdAlYF0SuM=
-github.com/stefanhaller/git-todo-parser v0.0.7-0.20240406123903-fd957137b6e2/go.mod h1:HFt9hGqMzgQ+gVxMKcvTvGaFz4Y0yYycqqAp2V3wcJY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
-github.com/thoas/go-funk v0.9.1/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q=
 github.com/urfave/cli v1.20.1-0.20180226030253-8e01ec4cd3e2/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
-github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8 h1:s/+U+w0teGzcoH2mdIlFQ6KfVKGaYpgyGdUefZrn9TU=
-golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
+golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c h1:dk0ukUIHmGHqASjP0iue2261isepFCC6XRCSd1nHgDw=
+golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c/go.mod h1:iQL9McJNjoIa5mjH6nYTCTZXUN6RP+XW3eib7Ya3XcI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20170407050850-f3918c30c5c2/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
-golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0 h1:KzcWKJ0nMAmGoBhYVMnkWc1rXjB42lKy5aIys4TdLOA=
@@ -655,16 +205,5 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

main.go

@@ -1,24 +1,151 @@
 package main
 
 import (
+	"bytes"
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"runtime"
+
+	"github.com/go-errors/errors"
+	"github.com/integrii/flaggy"
 	"github.com/jesseduffield/lazygit/pkg/app"
+	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/constants"
+	"github.com/jesseduffield/lazygit/pkg/env"
+	yaml "github.com/jesseduffield/yaml"
 )
 
-// These values may be set by the build script via the LDFLAGS argument
 var (
 	commit      string
+	version     = "unversioned"
 	date        string
-	version     string
 	buildSource = "unknown"
 )
 
 func main() {
-	ldFlagsBuildInfo := &app.BuildInfo{
-		Commit:      commit,
-		Date:        date,
-		Version:     version,
-		BuildSource: buildSource,
+	flaggy.DefaultParser.ShowVersionWithVersionFlag = false
+
+	repoPath := ""
+	flaggy.String(&repoPath, "p", "path", "Path of git repo. (equivalent to --work-tree=<path> --git-dir=<path>/.git/)")
+
+	filterPath := ""
+	flaggy.String(&filterPath, "f", "filter", "Path to filter on in `git log -- <path>`. When in filter mode, the commits, reflog, and stash are filtered based on the given path, and some operations are restricted")
+
+	dump := ""
+	flaggy.AddPositionalValue(&dump, "gitargs", 1, false, "Todo file")
+	flaggy.DefaultParser.PositionalFlags[0].Hidden = true
+
+	versionFlag := false
+	flaggy.Bool(&versionFlag, "v", "version", "Print the current version")
+
+	debuggingFlag := false
+	flaggy.Bool(&debuggingFlag, "d", "debug", "Run in debug mode with logging (see --logs flag below). Use the LOG_LEVEL env var to set the log level (debug/info/warn/error)")
+
+	logFlag := false
+	flaggy.Bool(&logFlag, "l", "logs", "Tail lazygit logs (intended to be used when `lazygit --debug` is called in a separate terminal tab)")
+
+	configFlag := false
+	flaggy.Bool(&configFlag, "c", "config", "Print the default config")
+
+	configDirFlag := false
+	flaggy.Bool(&configDirFlag, "cd", "print-config-dir", "Print the config directory")
+
+	useConfigDir := ""
+	flaggy.String(&useConfigDir, "ucd", "use-config-dir", "override default config directory with provided directory")
+
+	workTree := ""
+	flaggy.String(&workTree, "w", "work-tree", "equivalent of the --work-tree git argument")
+
+	gitDir := ""
+	flaggy.String(&gitDir, "g", "git-dir", "equivalent of the --git-dir git argument")
+
+	customConfig := ""
+	flaggy.String(&customConfig, "ucf", "use-config-file", "Comma seperated list to custom config file(s)")
+
+	flaggy.Parse()
+
+	if repoPath != "" {
+		if workTree != "" || gitDir != "" {
+			log.Fatal("--path option is incompatible with the --work-tree and --git-dir options")
+		}
+
+		absRepoPath, err := filepath.Abs(repoPath)
+		if err != nil {
+			log.Fatal(err)
+		}
+		workTree = absRepoPath
+		gitDir = filepath.Join(absRepoPath, ".git")
 	}
 
-	app.Start(ldFlagsBuildInfo, nil)
+	if customConfig != "" {
+		os.Setenv("LG_CONFIG_FILE", customConfig)
+	}
+
+	if useConfigDir != "" {
+		os.Setenv("CONFIG_DIR", useConfigDir)
+	}
+
+	if workTree != "" {
+		env.SetGitWorkTreeEnv(workTree)
+	}
+
+	if gitDir != "" {
+		env.SetGitDirEnv(gitDir)
+	}
+
+	if versionFlag {
+		fmt.Printf("commit=%s, build date=%s, build source=%s, version=%s, os=%s, arch=%s\n", commit, date, buildSource, version, runtime.GOOS, runtime.GOARCH)
+		os.Exit(0)
+	}
+
+	if configFlag {
+		var buf bytes.Buffer
+		encoder := yaml.NewEncoder(&buf)
+		err := encoder.Encode(config.GetDefaultConfig())
+		if err != nil {
+			log.Fatal(err.Error())
+		}
+		fmt.Printf("%s\n", buf.String())
+		os.Exit(0)
+	}
+
+	if configDirFlag {
+		fmt.Printf("%s\n", config.ConfigDir())
+		os.Exit(0)
+	}
+
+	if logFlag {
+		app.TailLogs()
+		os.Exit(0)
+	}
+
+	if workTree != "" {
+		if err := os.Chdir(workTree); err != nil {
+			log.Fatal(err.Error())
+		}
+	}
+
+	appConfig, err := config.NewAppConfig("lazygit", version, commit, date, buildSource, debuggingFlag)
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	app, err := app.NewApp(appConfig, filterPath)
+
+	if err == nil {
+		err = app.Run()
+	}
+
+	if err != nil {
+		if errorMessage, known := app.KnownError(err); known {
+			log.Fatal(errorMessage)
+		}
+		newErr := errors.Wrap(err, 0)
+		stackTrace := newErr.ErrorStack()
+		app.Log.Error(stackTrace)
+
+		log.Fatal(fmt.Sprintf("%s: %s\n\n%s", app.Tr.ErrorOccurred, constants.Links.Issues, stackTrace))
+	}
 }

pkg/app/app.go

@@ -2,119 +2,128 @@ package app
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
+	"regexp"
+	"strconv"
 	"strings"
 
-	"github.com/go-errors/errors"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/afero"
-
-	appTypes "github.com/jesseduffield/lazygit/pkg/app/types"
+	"github.com/aybabtme/humanlog"
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/constants"
 	"github.com/jesseduffield/lazygit/pkg/env"
 	"github.com/jesseduffield/lazygit/pkg/gui"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
-	integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types"
-	"github.com/jesseduffield/lazygit/pkg/logs"
 	"github.com/jesseduffield/lazygit/pkg/updates"
+	"github.com/sirupsen/logrus"
 )
 
-// App is the struct that's instantiated from within main.go and it manages
-// bootstrapping and running the application.
+// App struct
 type App struct {
 	*common.Common
-	closers   []io.Closer
-	Config    config.AppConfigurer
-	OSCommand *oscommands.OSCommand
-	Gui       *gui.Gui
+	closers       []io.Closer
+	Config        config.AppConfigurer
+	OSCommand     *oscommands.OSCommand
+	Gui           *gui.Gui
+	Updater       *updates.Updater // may only need this on the Gui
+	ClientContext string
 }
 
-func Run(
-	config config.AppConfigurer,
-	common *common.Common,
-	startArgs appTypes.StartArgs,
-) {
-	app, err := NewApp(config, startArgs.IntegrationTest, common)
+type errorMapping struct {
+	originalError string
+	newError      string
+}
 
-	if err == nil {
-		err = app.Run(startArgs)
-	}
+func newProductionLogger() *logrus.Logger {
+	log := logrus.New()
+	log.Out = ioutil.Discard
+	log.SetLevel(logrus.ErrorLevel)
+	return log
+}
 
+func getLogLevel() logrus.Level {
+	strLevel := os.Getenv("LOG_LEVEL")
+	level, err := logrus.ParseLevel(strLevel)
 	if err != nil {
-		if errorMessage, known := knownError(common.Tr, err); known {
-			log.Fatal(errorMessage)
-		}
-		newErr := errors.Wrap(err, 0)
-		stackTrace := newErr.ErrorStack()
-		app.Log.Error(stackTrace)
-
-		log.Fatalf("%s: %s\n\n%s", common.Tr.ErrorOccurred, constants.Links.Issues, stackTrace)
+		return logrus.DebugLevel
 	}
+	return level
 }
 
-func NewCommon(config config.AppConfigurer) (*common.Common, error) {
-	userConfig := config.GetUserConfig()
-	appState := config.GetAppState()
+func newDevelopmentLogger() *logrus.Logger {
+	logger := logrus.New()
+	logger.SetLevel(getLogLevel())
+	logPath, err := config.LogPath()
+	if err != nil {
+		log.Fatal(err)
+	}
+	file, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+	if err != nil {
+		log.Fatalf("Unable to log to log file: %v", err)
+	}
+	logger.SetOutput(file)
+	return logger
+}
 
+func newLogger(config config.AppConfigurer) *logrus.Entry {
+	var log *logrus.Logger
+	if config.GetDebug() || os.Getenv("DEBUG") == "TRUE" {
+		log = newDevelopmentLogger()
+	} else {
+		log = newProductionLogger()
+	}
+
+	// highly recommended: tail -f development.log | humanlog
+	// https://github.com/aybabtme/humanlog
+	log.Formatter = &logrus.JSONFormatter{}
+
+	return log.WithFields(logrus.Fields{
+		"debug":     config.GetDebug(),
+		"version":   config.GetVersion(),
+		"commit":    config.GetCommit(),
+		"buildDate": config.GetBuildDate(),
+	})
+}
+
+// NewApp bootstrap a new application
+func NewApp(config config.AppConfigurer, filterPath string) (*App, error) {
+	userConfig := config.GetUserConfig()
+
+	app := &App{
+		closers: []io.Closer{},
+		Config:  config,
+	}
 	var err error
 	log := newLogger(config)
 	tr, err := i18n.NewTranslationSetFromConfig(log, userConfig.Gui.Language)
 	if err != nil {
-		return nil, err
+		return app, err
 	}
 
-	return &common.Common{
+	app.Common = &common.Common{
 		Log:        log,
 		Tr:         tr,
 		UserConfig: userConfig,
-		AppState:   appState,
 		Debug:      config.GetDebug(),
-		Fs:         afero.NewOsFs(),
-	}, nil
-}
-
-func newLogger(cfg config.AppConfigurer) *logrus.Entry {
-	if cfg.GetDebug() {
-		logPath, err := config.LogPath()
-		if err != nil {
-			log.Fatal(err)
-		}
-		return logs.NewDevelopmentLogger(logPath)
-	} else {
-		return logs.NewProductionLogger()
-	}
-}
-
-// NewApp bootstrap a new application
-func NewApp(config config.AppConfigurer, test integrationTypes.IntegrationTest, common *common.Common) (*App, error) {
-	app := &App{
-		closers: []io.Closer{},
-		Config:  config,
-		Common:  common,
 	}
 
-	app.OSCommand = oscommands.NewOSCommand(common, config, oscommands.GetPlatform(), oscommands.NewNullGuiIO(app.Log))
-
-	updater, err := updates.NewUpdater(common, config, app.OSCommand)
-	if err != nil {
-		return app, err
+	// if we are being called in 'demon' mode, we can just return here
+	app.ClientContext = os.Getenv("LAZYGIT_CLIENT_COMMAND")
+	if app.ClientContext != "" {
+		return app, nil
 	}
 
-	dirName, err := os.Getwd()
-	if err != nil {
-		return app, err
-	}
+	app.OSCommand = oscommands.NewOSCommand(app.Common, oscommands.GetPlatform(), oscommands.NewNullGuiIO(log))
 
-	gitVersion, err := app.validateGitVersion()
+	app.Updater, err = updates.NewUpdater(app.Common, config, app.OSCommand)
 	if err != nil {
 		return app, err
 	}
@@ -124,51 +133,56 @@ func NewApp(config config.AppConfigurer, test integrationTypes.IntegrationTest,
 		return app, err
 	}
 
-	// used for testing purposes
-	if os.Getenv("SHOW_RECENT_REPOS") == "true" {
-		showRecentRepos = true
-	}
+	gitConfig := git_config.NewStdCachedGitConfig(app.Log)
 
-	app.Gui, err = gui.NewGui(common, config, gitVersion, updater, showRecentRepos, dirName, test)
+	app.Gui, err = gui.NewGui(app.Common, config, gitConfig, app.Updater, filterPath, showRecentRepos)
 	if err != nil {
 		return app, err
 	}
 	return app, nil
 }
 
-func (app *App) validateGitVersion() (*git_commands.GitVersion, error) {
-	version, err := git_commands.GetGitVersion(app.OSCommand)
+func (app *App) validateGitVersion() error {
+	output, err := app.OSCommand.Cmd.New("git --version").RunWithOutput()
 	// if we get an error anywhere here we'll show the same status
 	minVersionError := errors.New(app.Tr.MinGitVersionError)
 	if err != nil {
-		return nil, minVersionError
+		return minVersionError
 	}
 
-	if version.IsOlderThan(2, 20, 0) {
-		return nil, minVersionError
+	if isGitVersionValid(output) {
+		return nil
 	}
 
-	return version, nil
+	return minVersionError
 }
 
-func isDirectoryAGitRepository(dir string) (bool, error) {
-	info, err := os.Stat(filepath.Join(dir, ".git"))
-	return info != nil, err
-}
+func isGitVersionValid(versionStr string) bool {
+	// output should be something like: 'git version 2.23.0 (blah)'
+	re := regexp.MustCompile(`[^\d]+([\d\.]+)`)
+	matches := re.FindStringSubmatch(versionStr)
 
-func openRecentRepo(app *App) bool {
-	for _, repoDir := range app.Config.GetAppState().RecentRepos {
-		if isRepo, _ := isDirectoryAGitRepository(repoDir); isRepo {
-			if err := os.Chdir(repoDir); err == nil {
-				return true
-			}
-		}
+	if len(matches) == 0 {
+		return false
 	}
 
-	return false
+	gitVersion := matches[1]
+	majorVersion, err := strconv.Atoi(gitVersion[0:1])
+	if err != nil {
+		return false
+	}
+	if majorVersion < 2 {
+		return false
+	}
+
+	return true
 }
 
 func (app *App) setupRepo() (bool, error) {
+	if err := app.validateGitVersion(); err != nil {
+		return false, err
+	}
+
 	if env.GetGitDirEnv() != "" {
 		// we've been given the git dir directly. We'll verify this dir when initializing our Git object
 		return false, nil
@@ -180,100 +194,146 @@ func (app *App) setupRepo() (bool, error) {
 		if err != nil {
 			return false, err
 		}
-
-		if isRepo, err := isDirectoryAGitRepository(cwd); isRepo {
-			return false, err
+		info, _ := os.Stat(filepath.Join(cwd, ".git"))
+		if info != nil && info.IsDir() {
+			return false, err // Current directory appears to be a git repository.
 		}
 
-		var shouldInitRepo bool
-		initialBranchArg := ""
-		switch app.UserConfig.NotARepository {
-		case "prompt":
+		shouldInitRepo := true
+		notARepository := app.UserConfig.NotARepository
+		if notARepository == "prompt" {
 			// Offer to initialize a new repository in current directory.
 			fmt.Print(app.Tr.CreateRepo)
 			response, _ := bufio.NewReader(os.Stdin).ReadString('\n')
-			shouldInitRepo = (strings.Trim(response, " \r\n") == "y")
-			if shouldInitRepo {
-				// Ask for the initial branch name
-				fmt.Print(app.Tr.InitialBranch)
-				response, _ := bufio.NewReader(os.Stdin).ReadString('\n')
-				if trimmedResponse := strings.Trim(response, " \r\n"); len(trimmedResponse) > 0 {
-					initialBranchArg += "--initial-branch=" + trimmedResponse
-				}
+			if strings.Trim(response, " \n") != "y" {
+				shouldInitRepo = false
 			}
-		case "create":
-			shouldInitRepo = true
-		case "skip":
+		} else if notARepository == "skip" {
 			shouldInitRepo = false
-		case "quit":
-			fmt.Fprintln(os.Stderr, app.Tr.NotARepository)
-			os.Exit(1)
-		default:
-			fmt.Fprintln(os.Stderr, app.Tr.IncorrectNotARepository)
-			os.Exit(1)
 		}
 
-		if shouldInitRepo {
-			args := []string{"git", "init"}
-			if initialBranchArg != "" {
-				args = append(args, initialBranchArg)
-			}
-			if err := app.OSCommand.Cmd.New(args).Run(); err != nil {
+		if !shouldInitRepo {
+			// check if we have a recent repo we can open
+			recentRepos := app.Config.GetAppState().RecentRepos
+			if len(recentRepos) > 0 {
+				var err error
+				// try opening each repo in turn, in case any have been deleted
+				for _, repoDir := range recentRepos {
+					if err = os.Chdir(repoDir); err == nil {
+						return true, nil
+					}
+				}
 				return false, err
 			}
-			return false, nil
+
+			os.Exit(1)
 		}
-
-		// check if we have a recent repo we can open
-		for _, repoDir := range app.Config.GetAppState().RecentRepos {
-			if isRepo, _ := isDirectoryAGitRepository(repoDir); isRepo {
-				if err := os.Chdir(repoDir); err == nil {
-					return true, nil
-				}
-			}
-		}
-
-		fmt.Fprintln(os.Stderr, app.Tr.NoRecentRepositories)
-		os.Exit(1)
-	}
-
-	// Run this afterward so that the previous repo creation steps can run without this interfering
-	if isBare, err := git_commands.IsBareRepo(app.OSCommand); isBare {
-		if err != nil {
+		if err := app.OSCommand.Cmd.New("git init").Run(); err != nil {
 			return false, err
 		}
-
-		fmt.Print(app.Tr.BareRepo)
-
-		response, _ := bufio.NewReader(os.Stdin).ReadString('\n')
-
-		if shouldOpenRecent := strings.Trim(response, " \r\n") == "y"; !shouldOpenRecent {
-			os.Exit(0)
-		}
-
-		if didOpenRepo := openRecentRepo(app); didOpenRepo {
-			return true, nil
-		}
-
-		fmt.Println(app.Tr.NoRecentRepositories)
-		os.Exit(1)
 	}
 
 	return false, nil
 }
 
-func (app *App) Run(startArgs appTypes.StartArgs) error {
-	err := app.Gui.RunAndHandleError(startArgs)
+func (app *App) Run() error {
+	if app.ClientContext == "INTERACTIVE_REBASE" {
+		return app.Rebase()
+	}
+
+	if app.ClientContext == "EXIT_IMMEDIATELY" {
+		os.Exit(0)
+	}
+
+	err := app.Gui.RunAndHandleError()
 	return err
 }
 
+func gitDir() string {
+	dir := env.GetGitDirEnv()
+	if dir == "" {
+		return ".git"
+	}
+	return dir
+}
+
+// Rebase contains logic for when we've been run in demon mode, meaning we've
+// given lazygit as a command for git to call e.g. to edit a file
+func (app *App) Rebase() error {
+	app.Log.Info("Lazygit invoked as interactive rebase demon")
+	app.Log.Info("args: ", os.Args)
+
+	if strings.HasSuffix(os.Args[1], "git-rebase-todo") {
+		if err := ioutil.WriteFile(os.Args[1], []byte(os.Getenv("LAZYGIT_REBASE_TODO")), 0644); err != nil {
+			return err
+		}
+
+	} else if strings.HasSuffix(os.Args[1], filepath.Join(gitDir(), "COMMIT_EDITMSG")) { // TODO: test
+		// if we are rebasing and squashing, we'll see a COMMIT_EDITMSG
+		// but in this case we don't need to edit it, so we'll just return
+	} else {
+		app.Log.Info("Lazygit demon did not match on any use cases")
+	}
+
+	return nil
+}
+
 // Close closes any resources
 func (app *App) Close() error {
 	for _, closer := range app.closers {
-		if err := closer.Close(); err != nil {
+		err := closer.Close()
+		if err != nil {
 			return err
 		}
 	}
-
 	return nil
 }
+
+// KnownError takes an error and tells us whether it's an error that we know about where we can print a nicely formatted version of it rather than panicking with a stack trace
+func (app *App) KnownError(err error) (string, bool) {
+	errorMessage := err.Error()
+
+	knownErrorMessages := []string{app.Tr.MinGitVersionError}
+
+	for _, message := range knownErrorMessages {
+		if errorMessage == message {
+			return message, true
+		}
+	}
+
+	mappings := []errorMapping{
+		{
+			originalError: "fatal: not a git repository",
+			newError:      app.Tr.NotARepository,
+		},
+	}
+
+	for _, mapping := range mappings {
+		if strings.Contains(errorMessage, mapping.originalError) {
+			return mapping.newError, true
+		}
+	}
+	return "", false
+}
+
+func TailLogs() {
+	logFilePath, err := config.LogPath()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	fmt.Printf("Tailing log file %s\n\n", logFilePath)
+
+	opts := humanlog.DefaultOptions
+	opts.Truncates = false
+
+	_, err = os.Stat(logFilePath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			log.Fatal("Log file does not exist. Run `lazygit --debug` first to create the log file")
+		}
+		log.Fatal(err)
+	}
+
+	TailLogsForPlatform(logFilePath, opts)
+}

pkg/app/app_test.go

@@ -0,0 +1,45 @@
+package app
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsGitVersionValid(t *testing.T) {
+	type scenario struct {
+		versionStr     string
+		expectedResult bool
+	}
+
+	scenarios := []scenario{
+		{
+			"",
+			false,
+		},
+		{
+			"git version 1.9.0",
+			false,
+		},
+		{
+			"git version 1.9.0 (Apple Git-128)",
+			false,
+		},
+		{
+			"git version 2.4.0",
+			true,
+		},
+		{
+			"git version 2.24.3 (Apple Git-128)",
+			true,
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.versionStr, func(t *testing.T) {
+			result := isGitVersionValid(s.versionStr)
+			assert.Equal(t, result, s.expectedResult)
+		})
+	}
+}

pkg/app/daemon/daemon.go

@@ -1,380 +0,0 @@
-package daemon
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"strconv"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/common"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
-	"github.com/stefanhaller/git-todo-parser/todo"
-)
-
-// Sometimes lazygit will be invoked in daemon mode from a parent lazygit process.
-// We do this when git lets us supply a program to run within a git command.
-// For example, if we want to ensure that a git command doesn't hang due to
-// waiting for an editor to save a commit message, we can tell git to invoke lazygit
-// as the editor via 'GIT_EDITOR=lazygit', and use the env var
-// 'LAZYGIT_DAEMON_KIND=1' (exit immediately) to specify that we want to run lazygit
-// as a daemon which simply exits immediately.
-//
-// 'Daemon' is not the best name for this, because it's not a persistent background
-// process, but it's close enough.
-
-type DaemonKind int
-
-const (
-	// for when we fail to parse the daemon kind
-	DaemonKindUnknown DaemonKind = iota
-
-	DaemonKindExitImmediately
-	DaemonKindRemoveUpdateRefsForCopiedBranch
-	DaemonKindCherryPick
-	DaemonKindMoveTodosUp
-	DaemonKindMoveTodosDown
-	DaemonKindInsertBreak
-	DaemonKindChangeTodoActions
-	DaemonKindMoveFixupCommitDown
-	DaemonKindWriteRebaseTodo
-)
-
-const (
-	DaemonKindEnvKey string = "LAZYGIT_DAEMON_KIND"
-
-	// Contains json-encoded arguments to the daemon
-	DaemonInstructionEnvKey string = "LAZYGIT_DAEMON_INSTRUCTION"
-)
-
-func getInstruction() Instruction {
-	jsonData := os.Getenv(DaemonInstructionEnvKey)
-
-	mapping := map[DaemonKind]func(string) Instruction{
-		DaemonKindExitImmediately:                 deserializeInstruction[*ExitImmediatelyInstruction],
-		DaemonKindRemoveUpdateRefsForCopiedBranch: deserializeInstruction[*RemoveUpdateRefsForCopiedBranchInstruction],
-		DaemonKindCherryPick:                      deserializeInstruction[*CherryPickCommitsInstruction],
-		DaemonKindChangeTodoActions:               deserializeInstruction[*ChangeTodoActionsInstruction],
-		DaemonKindMoveFixupCommitDown:             deserializeInstruction[*MoveFixupCommitDownInstruction],
-		DaemonKindMoveTodosUp:                     deserializeInstruction[*MoveTodosUpInstruction],
-		DaemonKindMoveTodosDown:                   deserializeInstruction[*MoveTodosDownInstruction],
-		DaemonKindInsertBreak:                     deserializeInstruction[*InsertBreakInstruction],
-		DaemonKindWriteRebaseTodo:                 deserializeInstruction[*WriteRebaseTodoInstruction],
-	}
-
-	return mapping[getDaemonKind()](jsonData)
-}
-
-func Handle(common *common.Common) {
-	if !InDaemonMode() {
-		return
-	}
-
-	instruction := getInstruction()
-
-	if err := instruction.run(common); err != nil {
-		log.Fatal(err)
-	}
-
-	os.Exit(0)
-}
-
-func InDaemonMode() bool {
-	return getDaemonKind() != DaemonKindUnknown
-}
-
-func getDaemonKind() DaemonKind {
-	intValue, err := strconv.Atoi(os.Getenv(DaemonKindEnvKey))
-	if err != nil {
-		return DaemonKindUnknown
-	}
-
-	return DaemonKind(intValue)
-}
-
-func getCommentChar() byte {
-	cmd := exec.Command("git", "config", "--get", "--null", "core.commentChar")
-	if output, err := cmd.Output(); err == nil && len(output) == 2 {
-		return output[0]
-	}
-
-	return '#'
-}
-
-// An Instruction is a command to be run by lazygit in daemon mode.
-// It is serialized to json and passed to lazygit via environment variables
-type Instruction interface {
-	Kind() DaemonKind
-	SerializedInstructions() string
-
-	// runs the instruction
-	run(common *common.Common) error
-}
-
-func serializeInstruction[T any](instruction T) string {
-	jsonData, err := json.Marshal(instruction)
-	if err != nil {
-		// this should never happen
-		panic(err)
-	}
-
-	return string(jsonData)
-}
-
-func deserializeInstruction[T Instruction](jsonData string) Instruction {
-	var instruction T
-	err := json.Unmarshal([]byte(jsonData), &instruction)
-	if err != nil {
-		panic(err)
-	}
-
-	return instruction
-}
-
-func ToEnvVars(instruction Instruction) []string {
-	return []string{
-		fmt.Sprintf("%s=%d", DaemonKindEnvKey, instruction.Kind()),
-		fmt.Sprintf("%s=%s", DaemonInstructionEnvKey, instruction.SerializedInstructions()),
-	}
-}
-
-type ExitImmediatelyInstruction struct{}
-
-func (self *ExitImmediatelyInstruction) Kind() DaemonKind {
-	return DaemonKindExitImmediately
-}
-
-func (self *ExitImmediatelyInstruction) SerializedInstructions() string {
-	return serializeInstruction(self)
-}
-
-func (self *ExitImmediatelyInstruction) run(common *common.Common) error {
-	return nil
-}
-
-func NewExitImmediatelyInstruction() Instruction {
-	return &ExitImmediatelyInstruction{}
-}
-
-type RemoveUpdateRefsForCopiedBranchInstruction struct{}
-
-func (self *RemoveUpdateRefsForCopiedBranchInstruction) Kind() DaemonKind {
-	return DaemonKindRemoveUpdateRefsForCopiedBranch
-}
-
-func (self *RemoveUpdateRefsForCopiedBranchInstruction) SerializedInstructions() string {
-	return serializeInstruction(self)
-}
-
-func (self *RemoveUpdateRefsForCopiedBranchInstruction) run(common *common.Common) error {
-	return handleInteractiveRebase(common, func(path string) error {
-		return nil
-	})
-}
-
-func NewRemoveUpdateRefsForCopiedBranchInstruction() Instruction {
-	return &RemoveUpdateRefsForCopiedBranchInstruction{}
-}
-
-type CherryPickCommitsInstruction struct {
-	Todo string
-}
-
-func NewCherryPickCommitsInstruction(commits []*models.Commit) Instruction {
-	todoLines := lo.Map(commits, func(commit *models.Commit, _ int) TodoLine {
-		return TodoLine{
-			Action: "pick",
-			Commit: commit,
-		}
-	})
-
-	todo := TodoLinesToString(todoLines)
-
-	return &CherryPickCommitsInstruction{
-		Todo: todo,
-	}
-}
-
-func (self *CherryPickCommitsInstruction) Kind() DaemonKind {
-	return DaemonKindCherryPick
-}
-
-func (self *CherryPickCommitsInstruction) SerializedInstructions() string {
-	return serializeInstruction(self)
-}
-
-func (self *CherryPickCommitsInstruction) run(common *common.Common) error {
-	return handleInteractiveRebase(common, func(path string) error {
-		return utils.PrependStrToTodoFile(path, []byte(self.Todo))
-	})
-}
-
-type ChangeTodoActionsInstruction struct {
-	Changes []ChangeTodoAction
-}
-
-func NewChangeTodoActionsInstruction(changes []ChangeTodoAction) Instruction {
-	return &ChangeTodoActionsInstruction{
-		Changes: changes,
-	}
-}
-
-func (self *ChangeTodoActionsInstruction) Kind() DaemonKind {
-	return DaemonKindChangeTodoActions
-}
-
-func (self *ChangeTodoActionsInstruction) SerializedInstructions() string {
-	return serializeInstruction(self)
-}
-
-func (self *ChangeTodoActionsInstruction) run(common *common.Common) error {
-	return handleInteractiveRebase(common, func(path string) error {
-		changes := lo.Map(self.Changes, func(c ChangeTodoAction, _ int) utils.TodoChange {
-			return utils.TodoChange{
-				Hash:      c.Hash,
-				OldAction: todo.Pick,
-				NewAction: c.NewAction,
-			}
-		})
-
-		return utils.EditRebaseTodo(path, changes, getCommentChar())
-	})
-}
-
-// Takes the hash of some commit, and the hash of a fixup commit that was created
-// at the end of the branch, then moves the fixup commit down to right after the
-// original commit, changing its type to "fixup"
-type MoveFixupCommitDownInstruction struct {
-	OriginalHash string
-	FixupHash    string
-}
-
-func NewMoveFixupCommitDownInstruction(originalHash string, fixupHash string) Instruction {
-	return &MoveFixupCommitDownInstruction{
-		OriginalHash: originalHash,
-		FixupHash:    fixupHash,
-	}
-}
-
-func (self *MoveFixupCommitDownInstruction) Kind() DaemonKind {
-	return DaemonKindMoveFixupCommitDown
-}
-
-func (self *MoveFixupCommitDownInstruction) SerializedInstructions() string {
-	return serializeInstruction(self)
-}
-
-func (self *MoveFixupCommitDownInstruction) run(common *common.Common) error {
-	return handleInteractiveRebase(common, func(path string) error {
-		return utils.MoveFixupCommitDown(path, self.OriginalHash, self.FixupHash, getCommentChar())
-	})
-}
-
-type MoveTodosUpInstruction struct {
-	Hashes []string
-}
-
-func NewMoveTodosUpInstruction(hashes []string) Instruction {
-	return &MoveTodosUpInstruction{
-		Hashes: hashes,
-	}
-}
-
-func (self *MoveTodosUpInstruction) Kind() DaemonKind {
-	return DaemonKindMoveTodosUp
-}
-
-func (self *MoveTodosUpInstruction) SerializedInstructions() string {
-	return serializeInstruction(self)
-}
-
-func (self *MoveTodosUpInstruction) run(common *common.Common) error {
-	todosToMove := lo.Map(self.Hashes, func(hash string, _ int) utils.Todo {
-		return utils.Todo{
-			Hash:   hash,
-			Action: todo.Pick,
-		}
-	})
-
-	return handleInteractiveRebase(common, func(path string) error {
-		return utils.MoveTodosUp(path, todosToMove, getCommentChar())
-	})
-}
-
-type MoveTodosDownInstruction struct {
-	Hashes []string
-}
-
-func NewMoveTodosDownInstruction(hashes []string) Instruction {
-	return &MoveTodosDownInstruction{
-		Hashes: hashes,
-	}
-}
-
-func (self *MoveTodosDownInstruction) Kind() DaemonKind {
-	return DaemonKindMoveTodosDown
-}
-
-func (self *MoveTodosDownInstruction) SerializedInstructions() string {
-	return serializeInstruction(self)
-}
-
-func (self *MoveTodosDownInstruction) run(common *common.Common) error {
-	todosToMove := lo.Map(self.Hashes, func(hash string, _ int) utils.Todo {
-		return utils.Todo{
-			Hash:   hash,
-			Action: todo.Pick,
-		}
-	})
-
-	return handleInteractiveRebase(common, func(path string) error {
-		return utils.MoveTodosDown(path, todosToMove, getCommentChar())
-	})
-}
-
-type InsertBreakInstruction struct{}
-
-func NewInsertBreakInstruction() Instruction {
-	return &InsertBreakInstruction{}
-}
-
-func (self *InsertBreakInstruction) Kind() DaemonKind {
-	return DaemonKindInsertBreak
-}
-
-func (self *InsertBreakInstruction) SerializedInstructions() string {
-	return serializeInstruction(self)
-}
-
-func (self *InsertBreakInstruction) run(common *common.Common) error {
-	return handleInteractiveRebase(common, func(path string) error {
-		return utils.PrependStrToTodoFile(path, []byte("break\n"))
-	})
-}
-
-type WriteRebaseTodoInstruction struct {
-	TodosFileContent []byte
-}
-
-func NewWriteRebaseTodoInstruction(todosFileContent []byte) Instruction {
-	return &WriteRebaseTodoInstruction{
-		TodosFileContent: todosFileContent,
-	}
-}
-
-func (self *WriteRebaseTodoInstruction) Kind() DaemonKind {
-	return DaemonKindWriteRebaseTodo
-}
-
-func (self *WriteRebaseTodoInstruction) SerializedInstructions() string {
-	return serializeInstruction(self)
-}
-
-func (self *WriteRebaseTodoInstruction) run(common *common.Common) error {
-	return handleInteractiveRebase(common, func(path string) error {
-		return os.WriteFile(path, self.TodosFileContent, 0o644)
-	})
-}

pkg/app/daemon/rebase.go

@@ -1,69 +0,0 @@
-package daemon
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/common"
-	"github.com/jesseduffield/lazygit/pkg/env"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
-	"github.com/stefanhaller/git-todo-parser/todo"
-)
-
-type TodoLine struct {
-	Action string
-	Commit *models.Commit
-}
-
-func (self *TodoLine) ToString() string {
-	if self.Action == "break" {
-		return self.Action + "\n"
-	} else {
-		return self.Action + " " + self.Commit.Hash + " " + self.Commit.Name + "\n"
-	}
-}
-
-func TodoLinesToString(todoLines []TodoLine) string {
-	lines := lo.Map(todoLines, func(todoLine TodoLine, _ int) string {
-		return todoLine.ToString()
-	})
-
-	return strings.Join(lo.Reverse(lines), "")
-}
-
-type ChangeTodoAction struct {
-	Hash      string
-	NewAction todo.TodoCommand
-}
-
-func handleInteractiveRebase(common *common.Common, f func(path string) error) error {
-	common.Log.Info("Lazygit invoked as interactive rebase demon")
-	common.Log.Info("args: ", os.Args)
-	path := os.Args[1]
-
-	if strings.HasSuffix(path, "git-rebase-todo") {
-		err := utils.RemoveUpdateRefsForCopiedBranch(path, getCommentChar())
-		if err != nil {
-			return err
-		}
-		return f(path)
-	} else if strings.HasSuffix(path, filepath.Join(gitDir(), "COMMIT_EDITMSG")) { // TODO: test
-		// if we are rebasing and squashing, we'll see a COMMIT_EDITMSG
-		// but in this case we don't need to edit it, so we'll just return
-	} else {
-		common.Log.Info("Lazygit demon did not match on any use cases")
-	}
-
-	return nil
-}
-
-func gitDir() string {
-	dir := env.GetGitDirEnv()
-	if dir == "" {
-		return ".git"
-	}
-	return dir
-}

pkg/app/entry_point.go

@@ -1,298 +0,0 @@
-package app
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"net/http"
-	_ "net/http/pprof"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"runtime/debug"
-	"strings"
-
-	"github.com/integrii/flaggy"
-	"github.com/jesseduffield/lazygit/pkg/app/daemon"
-	appTypes "github.com/jesseduffield/lazygit/pkg/app/types"
-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/env"
-	integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types"
-	"github.com/jesseduffield/lazygit/pkg/logs/tail"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
-	"gopkg.in/yaml.v3"
-)
-
-type cliArgs struct {
-	RepoPath           string
-	FilterPath         string
-	GitArg             string
-	PrintVersionInfo   bool
-	Debug              bool
-	TailLogs           bool
-	Profile            bool
-	PrintDefaultConfig bool
-	PrintConfigDir     bool
-	UseConfigDir       string
-	WorkTree           string
-	GitDir             string
-	CustomConfigFile   string
-}
-
-type BuildInfo struct {
-	Commit      string
-	Date        string
-	Version     string
-	BuildSource string
-}
-
-func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTest) {
-	cliArgs := parseCliArgsAndEnvVars()
-	mergeBuildInfo(buildInfo)
-
-	if cliArgs.RepoPath != "" {
-		if cliArgs.WorkTree != "" || cliArgs.GitDir != "" {
-			log.Fatal("--path option is incompatible with the --work-tree and --git-dir options")
-		}
-
-		absRepoPath, err := filepath.Abs(cliArgs.RepoPath)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if isRepo, err := isDirectoryAGitRepository(absRepoPath); err != nil || !isRepo {
-			log.Fatal(absRepoPath + " is not a valid git repository.")
-		}
-
-		cliArgs.GitDir = filepath.Join(absRepoPath, ".git")
-		err = os.Chdir(absRepoPath)
-		if err != nil {
-			log.Fatalf("Failed to change directory to %s: %v", absRepoPath, err)
-		}
-	} else if cliArgs.WorkTree != "" {
-		env.SetWorkTreeEnv(cliArgs.WorkTree)
-
-		if err := os.Chdir(cliArgs.WorkTree); err != nil {
-			log.Fatalf("Failed to change directory to %s: %v", cliArgs.WorkTree, err)
-		}
-	}
-
-	if cliArgs.CustomConfigFile != "" {
-		os.Setenv("LG_CONFIG_FILE", cliArgs.CustomConfigFile)
-	}
-
-	if cliArgs.UseConfigDir != "" {
-		os.Setenv("CONFIG_DIR", cliArgs.UseConfigDir)
-	}
-
-	if cliArgs.GitDir != "" {
-		env.SetGitDirEnv(cliArgs.GitDir)
-	}
-
-	if cliArgs.PrintVersionInfo {
-		gitVersion := getGitVersionInfo()
-		fmt.Printf("commit=%s, build date=%s, build source=%s, version=%s, os=%s, arch=%s, git version=%s\n", buildInfo.Commit, buildInfo.Date, buildInfo.BuildSource, buildInfo.Version, runtime.GOOS, runtime.GOARCH, gitVersion)
-		os.Exit(0)
-	}
-
-	if cliArgs.PrintDefaultConfig {
-		var buf bytes.Buffer
-		encoder := yaml.NewEncoder(&buf)
-		err := encoder.Encode(config.GetDefaultConfig())
-		if err != nil {
-			log.Fatal(err.Error())
-		}
-		fmt.Printf("%s\n", buf.String())
-		os.Exit(0)
-	}
-
-	if cliArgs.PrintConfigDir {
-		fmt.Printf("%s\n", config.ConfigDir())
-		os.Exit(0)
-	}
-
-	if cliArgs.TailLogs {
-		logPath, err := config.LogPath()
-		if err != nil {
-			log.Fatal(err.Error())
-		}
-
-		tail.TailLogs(logPath)
-		os.Exit(0)
-	}
-
-	tempDir, err := os.MkdirTemp("", "lazygit-*")
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-	defer os.RemoveAll(tempDir)
-
-	appConfig, err := config.NewAppConfig("lazygit", buildInfo.Version, buildInfo.Commit, buildInfo.Date, buildInfo.BuildSource, cliArgs.Debug, tempDir)
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	if integrationTest != nil {
-		integrationTest.SetupConfig(appConfig)
-	}
-
-	common, err := NewCommon(appConfig)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if daemon.InDaemonMode() {
-		daemon.Handle(common)
-		return
-	}
-
-	if cliArgs.Profile {
-		go func() {
-			if err := http.ListenAndServe("localhost:6060", nil); err != nil {
-				log.Fatal(err)
-			}
-		}()
-	}
-
-	parsedGitArg := parseGitArg(cliArgs.GitArg)
-
-	Run(appConfig, common, appTypes.NewStartArgs(cliArgs.FilterPath, parsedGitArg, integrationTest))
-}
-
-func parseCliArgsAndEnvVars() *cliArgs {
-	flaggy.DefaultParser.ShowVersionWithVersionFlag = false
-
-	repoPath := ""
-	flaggy.String(&repoPath, "p", "path", "Path of git repo. (equivalent to --work-tree=<path> --git-dir=<path>/.git/)")
-
-	filterPath := ""
-	flaggy.String(&filterPath, "f", "filter", "Path to filter on in `git log -- <path>`. When in filter mode, the commits, reflog, and stash are filtered based on the given path, and some operations are restricted")
-
-	gitArg := ""
-	flaggy.AddPositionalValue(&gitArg, "git-arg", 1, false, "Panel to focus upon opening lazygit. Accepted values (based on git terminology): status, branch, log, stash. Ignored if --filter arg is passed.")
-
-	printVersionInfo := false
-	flaggy.Bool(&printVersionInfo, "v", "version", "Print the current version")
-
-	debug := false
-	flaggy.Bool(&debug, "d", "debug", "Run in debug mode with logging (see --logs flag below). Use the LOG_LEVEL env var to set the log level (debug/info/warn/error)")
-
-	tailLogs := false
-	flaggy.Bool(&tailLogs, "l", "logs", "Tail lazygit logs (intended to be used when `lazygit --debug` is called in a separate terminal tab)")
-
-	profile := false
-	flaggy.Bool(&profile, "", "profile", "Start the profiler and serve it on http port 6060. See CONTRIBUTING.md for more info.")
-
-	printDefaultConfig := false
-	flaggy.Bool(&printDefaultConfig, "c", "config", "Print the default config")
-
-	printConfigDir := false
-	flaggy.Bool(&printConfigDir, "cd", "print-config-dir", "Print the config directory")
-
-	useConfigDir := ""
-	flaggy.String(&useConfigDir, "ucd", "use-config-dir", "override default config directory with provided directory")
-
-	workTree := os.Getenv("GIT_WORK_TREE")
-	flaggy.String(&workTree, "w", "work-tree", "equivalent of the --work-tree git argument")
-
-	gitDir := os.Getenv("GIT_DIR")
-	flaggy.String(&gitDir, "g", "git-dir", "equivalent of the --git-dir git argument")
-
-	customConfigFile := ""
-	flaggy.String(&customConfigFile, "ucf", "use-config-file", "Comma separated list to custom config file(s)")
-
-	flaggy.Parse()
-
-	if os.Getenv("DEBUG") == "TRUE" {
-		debug = true
-	}
-
-	return &cliArgs{
-		RepoPath:           repoPath,
-		FilterPath:         filterPath,
-		GitArg:             gitArg,
-		PrintVersionInfo:   printVersionInfo,
-		Debug:              debug,
-		TailLogs:           tailLogs,
-		Profile:            profile,
-		PrintDefaultConfig: printDefaultConfig,
-		PrintConfigDir:     printConfigDir,
-		UseConfigDir:       useConfigDir,
-		WorkTree:           workTree,
-		GitDir:             gitDir,
-		CustomConfigFile:   customConfigFile,
-	}
-}
-
-func parseGitArg(gitArg string) appTypes.GitArg {
-	typedArg := appTypes.GitArg(gitArg)
-
-	// using switch so that linter catches when a new git arg value is defined but not handled here
-	switch typedArg {
-	case appTypes.GitArgNone, appTypes.GitArgStatus, appTypes.GitArgBranch, appTypes.GitArgLog, appTypes.GitArgStash:
-		return typedArg
-	}
-
-	permittedValues := []string{
-		string(appTypes.GitArgStatus),
-		string(appTypes.GitArgBranch),
-		string(appTypes.GitArgLog),
-		string(appTypes.GitArgStash),
-	}
-
-	log.Fatalf("Invalid git arg value: '%s'. Must be one of the following values: %s. e.g. 'lazygit status'. See 'lazygit --help'.",
-		gitArg,
-		strings.Join(permittedValues, ", "),
-	)
-
-	panic("unreachable")
-}
-
-// the buildInfo struct we get passed in is based on what's baked into the lazygit
-// binary via the LDFLAGS argument. Some lazygit distributions will make use of these
-// arguments and some will not. Go recently started baking in build info
-// into the binary by default e.g. the git commit hash. So in this function
-// we merge the two together, giving priority to the stuff set by LDFLAGS.
-// Note: this mutates the argument passed in
-func mergeBuildInfo(buildInfo *BuildInfo) {
-	// if the version has already been set by build flags then we'll honour that.
-	// chances are it's something like v0.31.0 which is more informative than a
-	// commit hash.
-	if buildInfo.Version != "" {
-		return
-	}
-
-	buildInfo.Version = "unversioned"
-
-	goBuildInfo, ok := debug.ReadBuildInfo()
-	if !ok {
-		return
-	}
-
-	revision, ok := lo.Find(goBuildInfo.Settings, func(setting debug.BuildSetting) bool {
-		return setting.Key == "vcs.revision"
-	})
-	if ok {
-		buildInfo.Commit = revision.Value
-		// if lazygit was built from source we'll show the version as the
-		// abbreviated commit hash
-		buildInfo.Version = utils.ShortHash(revision.Value)
-	}
-
-	// if version hasn't been set we assume that neither has the date
-	time, ok := lo.Find(goBuildInfo.Settings, func(setting debug.BuildSetting) bool {
-		return setting.Key == "vcs.time"
-	})
-	if ok {
-		buildInfo.Date = time.Value
-	}
-}
-
-func getGitVersionInfo() string {
-	cmd := exec.Command("git", "--version")
-	stdout, _ := cmd.Output()
-	gitVersion := strings.Trim(strings.TrimPrefix(string(stdout), "git version "), " \r\n")
-	return gitVersion
-}

pkg/app/errors.go

@@ -1,43 +0,0 @@
-package app
-
-import (
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/samber/lo"
-)
-
-type errorMapping struct {
-	originalError string
-	newError      string
-}
-
-// knownError takes an error and tells us whether it's an error that we know about where we can print a nicely formatted version of it rather than panicking with a stack trace
-func knownError(tr *i18n.TranslationSet, err error) (string, bool) {
-	errorMessage := err.Error()
-
-	knownErrorMessages := []string{tr.MinGitVersionError}
-
-	if lo.Contains(knownErrorMessages, errorMessage) {
-		return errorMessage, true
-	}
-
-	mappings := []errorMapping{
-		{
-			originalError: "fatal: not a git repository",
-			newError:      tr.NotARepository,
-		},
-		{
-			originalError: "getwd: no such file or directory",
-			newError:      tr.WorkingDirectoryDoesNotExist,
-		},
-	}
-
-	if mapping, ok := lo.Find(mappings, func(mapping errorMapping) bool {
-		return strings.Contains(errorMessage, mapping.originalError)
-	}); ok {
-		return mapping.newError, true
-	}
-
-	return "", false
-}

pkg/app/logging.go

@@ -0,0 +1,31 @@
+//go:build !windows
+// +build !windows
+
+package app
+
+import (
+	"log"
+	"os"
+
+	"github.com/aybabtme/humanlog"
+	"github.com/jesseduffield/lazygit/pkg/secureexec"
+)
+
+func TailLogsForPlatform(logFilePath string, opts *humanlog.HandlerOptions) {
+	cmd := secureexec.Command("tail", "-f", logFilePath)
+
+	stdout, _ := cmd.StdoutPipe()
+	if err := cmd.Start(); err != nil {
+		log.Fatal(err)
+	}
+
+	if err := humanlog.Scanner(stdout, os.Stdout, opts); err != nil {
+		log.Fatal(err)
+	}
+
+	if err := cmd.Wait(); err != nil {
+		log.Fatal(err)
+	}
+
+	os.Exit(0)
+}

pkg/app/logging_windows.go

@@ -0,0 +1,72 @@
+//go:build windows
+// +build windows
+
+package app
+
+import (
+	"bufio"
+	"github.com/aybabtme/humanlog"
+	"log"
+	"os"
+	"strings"
+	"time"
+)
+
+func TailLogsForPlatform(logFilePath string, opts *humanlog.HandlerOptions) {
+	var lastModified int64 = 0
+	var lastOffset int64 = 0
+	for {
+		stat, err := os.Stat(logFilePath)
+		if err != nil {
+			log.Fatal(err)
+		}
+		if stat.ModTime().Unix() > lastModified {
+			err = TailFrom(lastOffset, logFilePath, opts)
+			if err != nil {
+				log.Fatal(err)
+			}
+		}
+		lastOffset = stat.Size()
+		time.Sleep(1 * time.Second)
+	}
+}
+
+func OpenAndSeek(filepath string, offset int64) (*os.File, error) {
+	file, err := os.Open(filepath)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = file.Seek(offset, 0)
+	if err != nil {
+		_ = file.Close()
+		return nil, err
+	}
+	return file, nil
+}
+
+func TailFrom(lastOffset int64, logFilePath string, opts *humanlog.HandlerOptions) error {
+	file, err := OpenAndSeek(logFilePath, lastOffset)
+	if err != nil {
+		return err
+	}
+
+	fileScanner := bufio.NewScanner(file)
+	var lines []string
+	for fileScanner.Scan() {
+		lines = append(lines, fileScanner.Text())
+	}
+	file.Close()
+	lineCount := len(lines)
+	lastTen := lines
+	if lineCount > 10 {
+		lastTen = lines[lineCount-10:]
+	}
+	for _, line := range lastTen {
+		reader := strings.NewReader(line)
+		if err := humanlog.Scanner(reader, os.Stdout, opts); err != nil {
+			log.Fatal(err)
+		}
+	}
+	return nil
+}

pkg/app/types/types.go

@@ -1,33 +0,0 @@
-package app
-
-import (
-	integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types"
-)
-
-// StartArgs is the struct that represents some things we want to do on program start
-type StartArgs struct {
-	// FilterPath determines which path we're going to filter on so that we only see commits from that file.
-	FilterPath string
-	// GitArg determines what context we open in
-	GitArg GitArg
-	// integration test (only relevant when invoking lazygit in the context of an integration test)
-	IntegrationTest integrationTypes.IntegrationTest
-}
-
-type GitArg string
-
-const (
-	GitArgNone   GitArg = ""
-	GitArgStatus GitArg = "status"
-	GitArgBranch GitArg = "branch"
-	GitArgLog    GitArg = "log"
-	GitArgStash  GitArg = "stash"
-)
-
-func NewStartArgs(filterPath string, gitArg GitArg, test integrationTypes.IntegrationTest) StartArgs {
-	return StartArgs{
-		FilterPath:      filterPath,
-		GitArg:          gitArg,
-		IntegrationTest: test,
-	}
-}

pkg/cheatsheet/check.go

@@ -0,0 +1,79 @@
+package cheatsheet
+
+import (
+	"fmt"
+	"io/fs"
+	"io/ioutil"
+	"log"
+	"os"
+	"path/filepath"
+	"regexp"
+
+	"github.com/pmezard/go-difflib/difflib"
+)
+
+func Check() {
+	dir := GetDir()
+	tmpDir := filepath.Join(os.TempDir(), "lazygit_cheatsheet")
+	err := os.RemoveAll(tmpDir)
+	if err != nil {
+		log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
+	}
+	err = os.Mkdir(tmpDir, 0700)
+	if err != nil {
+		log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
+	}
+
+	generateAtDir(tmpDir)
+	defer os.RemoveAll(tmpDir)
+
+	actualContent := obtainContent(dir)
+	expectedContent := obtainContent(tmpDir)
+
+	if expectedContent == "" {
+		log.Fatal("empty expected content")
+	}
+
+	if actualContent != expectedContent {
+		err := difflib.WriteUnifiedDiff(os.Stdout, difflib.UnifiedDiff{
+			A:        difflib.SplitLines(expectedContent),
+			B:        difflib.SplitLines(actualContent),
+			FromFile: "Expected",
+			FromDate: "",
+			ToFile:   "Actual",
+			ToDate:   "",
+			Context:  1,
+		})
+		if err != nil {
+			log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
+		}
+		fmt.Printf("\nCheatsheets are out of date. Please run `%s` at the project root and commit the changes\n", CommandToRun())
+		os.Exit(1)
+	}
+
+	fmt.Println("\nCheatsheets are up to date")
+}
+
+func obtainContent(dir string) string {
+	re := regexp.MustCompile(`Keybindings_\w+\.md$`)
+
+	content := ""
+	err := filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
+		if re.MatchString(path) {
+			bytes, err := ioutil.ReadFile(path)
+			if err != nil {
+				log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
+			}
+			content += fmt.Sprintf("\n%s\n\n", filepath.Base(path))
+			content += string(bytes)
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
+	}
+
+	return content
+}

pkg/cheatsheet/generate.go

@@ -1,12 +1,10 @@
-//go:generate go run generator.go
-
-// This "script" generates files called Keybindings_{{.LANG}}.md
-// in the docs/keybindings directory.
+// This "script" generates a file called Keybindings_{{.LANG}}.md
+// in current working directory.
 //
-// The content of these generated files is a keybindings cheatsheet.
+// The content of this generated file is a keybindings cheatsheet.
 //
-// To generate the cheatsheets, run:
-//   go generate pkg/cheatsheet/generate.go
+// To generate cheatsheet in english run:
+//   go run scripts/generate_cheatsheet.go
 
 package cheatsheet
 
@@ -14,70 +12,53 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"sort"
 
-	"github.com/jesseduffield/generics/maps"
-	"github.com/jesseduffield/lazycore/pkg/utils"
 	"github.com/jesseduffield/lazygit/pkg/app"
 	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/jesseduffield/lazygit/pkg/gui"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/samber/lo"
-	"golang.org/x/exp/slices"
+	"github.com/jesseduffield/lazygit/pkg/integration"
 )
 
 type bindingSection struct {
 	title    string
-	bindings []*types.Binding
-}
-
-type header struct {
-	// priority decides the order of the headers in the cheatsheet (lower means higher)
-	priority int
-	title    string
-}
-
-type headerWithBindings struct {
-	header   header
-	bindings []*types.Binding
+	bindings []*gui.Binding
 }
 
 func CommandToRun() string {
-	return "go generate ./..."
+	return "go run scripts/cheatsheet/main.go generate"
 }
 
-func GetKeybindingsDir() string {
-	return utils.GetLazyRootDirectory() + "/docs/keybindings"
+func GetDir() string {
+	return integration.GetRootDirectory() + "/docs/keybindings"
 }
 
 func generateAtDir(cheatsheetDir string) {
+	os.Setenv("LANG", "en")
+
 	translationSetsByLang := i18n.GetTranslationSets()
 	mConfig := config.NewDummyAppConfig()
 
 	for lang := range translationSetsByLang {
-		mConfig.GetUserConfig().Gui.Language = lang
-		common, err := app.NewCommon(mConfig)
-		if err != nil {
-			log.Fatal(err)
-		}
-		mApp, _ := app.NewApp(mConfig, nil, common)
+		os.Setenv("LC_ALL", lang)
+		mApp, _ := app.NewApp(mConfig, "")
 		path := cheatsheetDir + "/Keybindings_" + lang + ".md"
 		file, err := os.Create(path)
 		if err != nil {
 			panic(err)
 		}
 
-		bindings := mApp.Gui.GetCheatsheetKeybindings()
-		bindingSections := getBindingSections(bindings, mApp.Tr)
+		bindingSections := getBindingSections(mApp)
 		content := formatSections(mApp.Tr, bindingSections)
-		content = fmt.Sprintf("_This file is auto-generated. To update, make the changes in the "+
-			"pkg/i18n directory and then run `%s` from the project root._\n\n%s", CommandToRun(), content)
+		content = fmt.Sprintf("# This file is auto-generated. To update, make the changes in the "+
+			"pkg/i18n directory and then run `%s` from the project root.\n\n%s", CommandToRun(), content)
 		writeString(file, content)
 	}
 }
 
 func Generate() {
-	generateAtDir(GetKeybindingsDir())
+	generateAtDir(GetDir())
 }
 
 func writeString(file *os.File, str string) {
@@ -87,37 +68,39 @@ func writeString(file *os.File, str string) {
 	}
 }
 
-func localisedTitle(tr *i18n.TranslationSet, str string) string {
+func localisedTitle(mApp *app.App, str string) string {
+	tr := mApp.Tr
+
 	contextTitleMap := map[string]string{
-		"global":            tr.GlobalTitle,
-		"navigation":        tr.NavigationTitle,
-		"branches":          tr.BranchesTitle,
-		"localBranches":     tr.LocalBranchesTitle,
-		"files":             tr.FilesTitle,
-		"status":            tr.StatusTitle,
-		"submodules":        tr.SubmodulesTitle,
-		"subCommits":        tr.SubCommitsTitle,
-		"remoteBranches":    tr.RemoteBranchesTitle,
-		"remotes":           tr.RemotesTitle,
-		"reflogCommits":     tr.ReflogCommitsTitle,
-		"tags":              tr.TagsTitle,
-		"commitFiles":       tr.CommitFilesTitle,
-		"commitMessage":     tr.CommitSummaryTitle,
-		"commitDescription": tr.CommitDescriptionTitle,
-		"commits":           tr.CommitsTitle,
-		"confirmation":      tr.ConfirmationTitle,
-		"information":       tr.InformationTitle,
-		"main":              tr.NormalTitle,
-		"patchBuilding":     tr.PatchBuildingTitle,
-		"mergeConflicts":    tr.MergingTitle,
-		"staging":           tr.StagingTitle,
-		"menu":              tr.MenuTitle,
-		"search":            tr.SearchTitle,
-		"secondary":         tr.SecondaryTitle,
-		"stash":             tr.StashTitle,
-		"suggestions":       tr.SuggestionsCheatsheetTitle,
-		"extras":            tr.ExtrasTitle,
-		"worktrees":         tr.WorktreesTitle,
+		"global":         tr.GlobalTitle,
+		"navigation":     tr.NavigationTitle,
+		"branches":       tr.BranchesTitle,
+		"localBranches":  tr.LocalBranchesTitle,
+		"files":          tr.FilesTitle,
+		"status":         tr.StatusTitle,
+		"submodules":     tr.SubmodulesTitle,
+		"subCommits":     tr.SubCommitsTitle,
+		"remoteBranches": tr.RemoteBranchesTitle,
+		"remotes":        tr.RemotesTitle,
+		"reflogCommits":  tr.ReflogCommitsTitle,
+		"tags":           tr.TagsTitle,
+		"commitFiles":    tr.CommitFilesTitle,
+		"commitMessage":  tr.CommitMessageTitle,
+		"commits":        tr.CommitsTitle,
+		"confirmation":   tr.ConfirmationTitle,
+		"credentials":    tr.CredentialsTitle,
+		"information":    tr.InformationTitle,
+		"main":           tr.MainTitle,
+		"patchBuilding":  tr.PatchBuildingTitle,
+		"merging":        tr.MergingTitle,
+		"normal":         tr.NormalTitle,
+		"staging":        tr.StagingTitle,
+		"menu":           tr.MenuTitle,
+		"search":         tr.SearchTitle,
+		"secondary":      tr.SecondaryTitle,
+		"stash":          tr.StashTitle,
+		"suggestions":    tr.SuggestionsCheatsheetTitle,
+		"extras":         tr.ExtrasTitle,
 	}
 
 	title, ok := contextTitleMap[str]
@@ -128,94 +111,155 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 	return title
 }
 
-func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*bindingSection {
-	excludedViews := []string{"stagingSecondary", "patchBuildingSecondary"}
-	bindingsToDisplay := lo.Filter(bindings, func(binding *types.Binding, _ int) bool {
-		if lo.Contains(excludedViews, binding.ViewName) {
-			return false
-		}
-
-		return (binding.Description != "" || binding.Alternative != "") && binding.Key != nil
-	})
-
-	bindingsByHeader := lo.GroupBy(bindingsToDisplay, func(binding *types.Binding) header {
-		return getHeader(binding, tr)
-	})
-
-	bindingGroups := maps.MapToSlice(
-		bindingsByHeader,
-		func(header header, hBindings []*types.Binding) headerWithBindings {
-			uniqBindings := lo.UniqBy(hBindings, func(binding *types.Binding) string {
-				return binding.Description + keybindings.LabelFromKey(binding.Key)
-			})
-
-			return headerWithBindings{
-				header:   header,
-				bindings: uniqBindings,
-			}
-		},
-	)
-
-	slices.SortFunc(bindingGroups, func(a, b headerWithBindings) bool {
-		if a.header.priority != b.header.priority {
-			return a.header.priority > b.header.priority
-		}
-		return a.header.title < b.header.title
-	})
-
-	return lo.Map(bindingGroups, func(hb headerWithBindings, _ int) *bindingSection {
-		return &bindingSection{
-			title:    hb.header.title,
-			bindings: hb.bindings,
-		}
-	})
+func formatTitle(title string) string {
+	return fmt.Sprintf("\n## %s\n\n", title)
 }
 
-func getHeader(binding *types.Binding, tr *i18n.TranslationSet) header {
-	if binding.Tag == "navigation" {
-		return header{priority: 2, title: localisedTitle(tr, "navigation")}
+func formatBinding(binding *gui.Binding) string {
+	if binding.Alternative != "" {
+		return fmt.Sprintf("  <kbd>%s</kbd>: %s (%s)\n", gui.GetKeyDisplay(binding.Key), binding.Description, binding.Alternative)
+	}
+	return fmt.Sprintf("  <kbd>%s</kbd>: %s\n", gui.GetKeyDisplay(binding.Key), binding.Description)
+}
+
+func getBindingSections(mApp *app.App) []*bindingSection {
+	bindingSections := []*bindingSection{}
+
+	bindings := mApp.Gui.GetInitialKeybindings()
+
+	type contextAndViewType struct {
+		subtitle string
+		title    string
 	}
 
-	if binding.ViewName == "" {
-		return header{priority: 3, title: localisedTitle(tr, "global")}
+	contextAndViewBindingMap := map[contextAndViewType][]*gui.Binding{}
+
+outer:
+	for _, binding := range bindings {
+		if binding.Tag == "navigation" {
+			key := contextAndViewType{subtitle: "", title: "navigation"}
+			existing := contextAndViewBindingMap[key]
+			if existing == nil {
+				contextAndViewBindingMap[key] = []*gui.Binding{binding}
+			} else {
+				for _, navBinding := range contextAndViewBindingMap[key] {
+					if navBinding.Description == binding.Description {
+						continue outer
+					}
+				}
+				contextAndViewBindingMap[key] = append(contextAndViewBindingMap[key], binding)
+			}
+
+			continue outer
+		}
+
+		contexts := []string{}
+		if len(binding.Contexts) == 0 {
+			contexts = append(contexts, "")
+		} else {
+			contexts = append(contexts, binding.Contexts...)
+		}
+
+		for _, context := range contexts {
+			key := contextAndViewType{subtitle: context, title: binding.ViewName}
+			existing := contextAndViewBindingMap[key]
+			if existing == nil {
+				contextAndViewBindingMap[key] = []*gui.Binding{binding}
+			} else {
+				contextAndViewBindingMap[key] = append(contextAndViewBindingMap[key], binding)
+			}
+		}
 	}
 
-	return header{priority: 1, title: localisedTitle(tr, binding.ViewName)}
+	type groupedBindingsType struct {
+		contextAndView contextAndViewType
+		bindings       []*gui.Binding
+	}
+
+	groupedBindings := make([]groupedBindingsType, len(contextAndViewBindingMap))
+
+	for contextAndView, contextBindings := range contextAndViewBindingMap {
+		groupedBindings = append(groupedBindings, groupedBindingsType{contextAndView: contextAndView, bindings: contextBindings})
+	}
+
+	sort.Slice(groupedBindings, func(i, j int) bool {
+		first := groupedBindings[i].contextAndView
+		second := groupedBindings[j].contextAndView
+		if first.title == "" {
+			return true
+		}
+		if second.title == "" {
+			return false
+		}
+		if first.title == "navigation" {
+			return true
+		}
+		if second.title == "navigation" {
+			return false
+		}
+		return first.title < second.title || (first.title == second.title && first.subtitle < second.subtitle)
+	})
+
+	for _, group := range groupedBindings {
+		contextAndView := group.contextAndView
+		contextBindings := group.bindings
+		mApp.Log.Info("viewname: " + contextAndView.title + ", context: " + contextAndView.subtitle)
+		viewName := contextAndView.title
+		if viewName == "" {
+			viewName = "global"
+		}
+		translatedView := localisedTitle(mApp, viewName)
+		var title string
+		if contextAndView.subtitle == "" {
+			addendum := " " + mApp.Tr.Panel
+			if viewName == "global" || viewName == "navigation" {
+				addendum = ""
+			}
+			title = fmt.Sprintf("%s%s", translatedView, addendum)
+		} else {
+			translatedContextName := localisedTitle(mApp, contextAndView.subtitle)
+			title = fmt.Sprintf("%s %s (%s)", translatedView, mApp.Tr.Panel, translatedContextName)
+		}
+
+		for _, binding := range contextBindings {
+			bindingSections = addBinding(title, bindingSections, binding)
+		}
+	}
+
+	return bindingSections
+}
+
+func addBinding(title string, bindingSections []*bindingSection, binding *gui.Binding) []*bindingSection {
+	if binding.Description == "" && binding.Alternative == "" {
+		return bindingSections
+	}
+
+	for _, section := range bindingSections {
+		if title == section.title {
+			section.bindings = append(section.bindings, binding)
+			return bindingSections
+		}
+	}
+
+	section := &bindingSection{
+		title:    title,
+		bindings: []*gui.Binding{binding},
+	}
+
+	return append(bindingSections, section)
 }
 
 func formatSections(tr *i18n.TranslationSet, bindingSections []*bindingSection) string {
 	content := fmt.Sprintf("# Lazygit %s\n", tr.Keybindings)
 
-	content += fmt.Sprintf("\n%s\n", italicize(tr.KeybindingsLegend))
-
 	for _, section := range bindingSections {
 		content += formatTitle(section.title)
-		content += "| Key | Action | Info |\n"
-		content += "|-----|--------|-------------|\n"
+		content += "<pre>\n"
 		for _, binding := range section.bindings {
 			content += formatBinding(binding)
 		}
+		content += "</pre>\n"
 	}
 
 	return content
 }
-
-func formatTitle(title string) string {
-	return fmt.Sprintf("\n## %s\n\n", title)
-}
-
-func formatBinding(binding *types.Binding) string {
-	action := keybindings.LabelFromKey(binding.Key)
-	description := binding.Description
-	if binding.Alternative != "" {
-		action += fmt.Sprintf(" (%s)", binding.Alternative)
-	}
-
-	// Use backticks for keyboard keys. Two backticks are needed with an inner space
-	//  to escape a key that is itself a backtick.
-	return fmt.Sprintf("| `` %s `` | %s | %s |\n", action, description, binding.Tooltip)
-}
-
-func italicize(str string) string {
-	return fmt.Sprintf("_%s_", str)
-}

pkg/cheatsheet/generate_test.go

@@ -1,269 +0,0 @@
-package cheatsheet
-
-import (
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGetBindingSections(t *testing.T) {
-	tr := i18n.EnglishTranslationSet()
-
-	tests := []struct {
-		testName string
-		bindings []*types.Binding
-		expected []*bindingSection
-	}{
-		{
-			testName: "no bindings",
-			bindings: []*types.Binding{},
-			expected: []*bindingSection{},
-		},
-		{
-			testName: "one binding",
-			bindings: []*types.Binding{
-				{
-					ViewName:    "files",
-					Description: "stage file",
-					Key:         'a',
-				},
-			},
-			expected: []*bindingSection{
-				{
-					title: "Files",
-					bindings: []*types.Binding{
-						{
-							ViewName:    "files",
-							Description: "stage file",
-							Key:         'a',
-						},
-					},
-				},
-			},
-		},
-		{
-			testName: "global binding",
-			bindings: []*types.Binding{
-				{
-					ViewName:    "",
-					Description: "quit",
-					Key:         'a',
-				},
-			},
-			expected: []*bindingSection{
-				{
-					title: "Global keybindings",
-					bindings: []*types.Binding{
-						{
-							ViewName:    "",
-							Description: "quit",
-							Key:         'a',
-						},
-					},
-				},
-			},
-		},
-		{
-			testName: "grouped bindings",
-			bindings: []*types.Binding{
-				{
-					ViewName:    "files",
-					Description: "stage file",
-					Key:         'a',
-				},
-				{
-					ViewName:    "files",
-					Description: "unstage file",
-					Key:         'a',
-				},
-				{
-					ViewName:    "submodules",
-					Description: "drop submodule",
-					Key:         'a',
-				},
-			},
-			expected: []*bindingSection{
-				{
-					title: "Files",
-					bindings: []*types.Binding{
-						{
-							ViewName:    "files",
-							Description: "stage file",
-							Key:         'a',
-						},
-						{
-							ViewName:    "files",
-							Description: "unstage file",
-							Key:         'a',
-						},
-					},
-				},
-				{
-					title: "Submodules",
-					bindings: []*types.Binding{
-						{
-							ViewName:    "submodules",
-							Description: "drop submodule",
-							Key:         'a',
-						},
-					},
-				},
-			},
-		},
-		{
-			testName: "with navigation bindings",
-			bindings: []*types.Binding{
-				{
-					ViewName:    "files",
-					Description: "stage file",
-					Key:         'a',
-				},
-				{
-					ViewName:    "files",
-					Description: "unstage file",
-					Key:         'a',
-				},
-				{
-					ViewName:    "files",
-					Description: "scroll",
-					Key:         'a',
-					Tag:         "navigation",
-				},
-				{
-					ViewName:    "commits",
-					Description: "revert commit",
-					Key:         'a',
-				},
-			},
-			expected: []*bindingSection{
-				{
-					title: "List panel navigation",
-					bindings: []*types.Binding{
-						{
-							ViewName:    "files",
-							Description: "scroll",
-							Key:         'a',
-							Tag:         "navigation",
-						},
-					},
-				},
-				{
-					title: "Commits",
-					bindings: []*types.Binding{
-						{
-							ViewName:    "commits",
-							Description: "revert commit",
-							Key:         'a',
-						},
-					},
-				},
-				{
-					title: "Files",
-					bindings: []*types.Binding{
-						{
-							ViewName:    "files",
-							Description: "stage file",
-							Key:         'a',
-						},
-						{
-							ViewName:    "files",
-							Description: "unstage file",
-							Key:         'a',
-						},
-					},
-				},
-			},
-		},
-		{
-			testName: "with duplicate navigation bindings",
-			bindings: []*types.Binding{
-				{
-					ViewName:    "files",
-					Description: "stage file",
-					Key:         'a',
-				},
-				{
-					ViewName:    "files",
-					Description: "unstage file",
-					Key:         'a',
-				},
-				{
-					ViewName:    "files",
-					Description: "scroll",
-					Key:         'a',
-					Tag:         "navigation",
-				},
-				{
-					ViewName:    "commits",
-					Description: "revert commit",
-					Key:         'a',
-				},
-				{
-					ViewName:    "commits",
-					Description: "scroll",
-					Key:         'a',
-					Tag:         "navigation",
-				},
-				{
-					ViewName:    "commits",
-					Description: "page up",
-					Key:         'a',
-					Tag:         "navigation",
-				},
-			},
-			expected: []*bindingSection{
-				{
-					title: "List panel navigation",
-					bindings: []*types.Binding{
-						{
-							ViewName:    "files",
-							Description: "scroll",
-							Key:         'a',
-							Tag:         "navigation",
-						},
-						{
-							ViewName:    "commits",
-							Description: "page up",
-							Key:         'a',
-							Tag:         "navigation",
-						},
-					},
-				},
-				{
-					title: "Commits",
-					bindings: []*types.Binding{
-						{
-							ViewName:    "commits",
-							Description: "revert commit",
-							Key:         'a',
-						},
-					},
-				},
-				{
-					title: "Files",
-					bindings: []*types.Binding{
-						{
-							ViewName:    "files",
-							Description: "stage file",
-							Key:         'a',
-						},
-						{
-							ViewName:    "files",
-							Description: "unstage file",
-							Key:         'a',
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.testName, func(t *testing.T) {
-			actual := getBindingSections(test.bindings, &tr)
-			assert.EqualValues(t, test.expected, actual)
-		})
-	}
-}

pkg/cheatsheet/generator.go

@@ -1,14 +0,0 @@
-//go:build ignore
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/jesseduffield/lazygit/pkg/cheatsheet"
-)
-
-func main() {
-	fmt.Printf("Generating cheatsheets in %s...\n", cheatsheet.GetKeybindingsDir())
-	cheatsheet.Generate()
-}

pkg/commands/git.go

@@ -1,7 +1,9 @@
 package commands
 
 import (
+	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/go-errors/errors"
@@ -9,20 +11,20 @@ import (
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
+	"github.com/jesseduffield/lazygit/pkg/commands/loaders"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
 	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/jesseduffield/lazygit/pkg/env"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
 // GitCommand is our main git interface
 type GitCommand struct {
-	Blame       *git_commands.BlameCommands
 	Branch      *git_commands.BranchCommands
 	Commit      *git_commands.CommitCommands
 	Config      *git_commands.ConfigCommands
 	Custom      *git_commands.CustomCommands
-	Diff        *git_commands.DiffCommands
 	File        *git_commands.FileCommands
 	Flow        *git_commands.FlowCommands
 	Patch       *git_commands.PatchCommands
@@ -34,69 +36,54 @@ type GitCommand struct {
 	Sync        *git_commands.SyncCommands
 	Tag         *git_commands.TagCommands
 	WorkingTree *git_commands.WorkingTreeCommands
-	Bisect      *git_commands.BisectCommands
-	Worktree    *git_commands.WorktreeCommands
-	Version     *git_commands.GitVersion
-	RepoPaths   *git_commands.RepoPaths
 
 	Loaders Loaders
 }
 
 type Loaders struct {
-	BranchLoader       *git_commands.BranchLoader
-	CommitFileLoader   *git_commands.CommitFileLoader
-	CommitLoader       *git_commands.CommitLoader
-	FileLoader         *git_commands.FileLoader
-	ReflogCommitLoader *git_commands.ReflogCommitLoader
-	RemoteLoader       *git_commands.RemoteLoader
-	StashLoader        *git_commands.StashLoader
-	TagLoader          *git_commands.TagLoader
-	Worktrees          *git_commands.WorktreeLoader
+	Branches      *loaders.BranchLoader
+	CommitFiles   *loaders.CommitFileLoader
+	Commits       *loaders.CommitLoader
+	Files         *loaders.FileLoader
+	ReflogCommits *loaders.ReflogCommitLoader
+	Remotes       *loaders.RemoteLoader
+	Stash         *loaders.StashLoader
+	Tags          *loaders.TagLoader
 }
 
 func NewGitCommand(
 	cmn *common.Common,
-	version *git_commands.GitVersion,
 	osCommand *oscommands.OSCommand,
 	gitConfig git_config.IGitConfig,
 ) (*GitCommand, error) {
-	repoPaths, err := git_commands.GetRepoPaths(osCommand.Cmd, version)
-	if err != nil {
-		return nil, errors.Errorf("Error getting repo paths: %v", err)
+	if err := navigateToRepoRootDirectory(os.Stat, os.Chdir); err != nil {
+		return nil, err
 	}
 
-	err = os.Chdir(repoPaths.WorktreePath())
+	repo, err := setupRepository(gogit.PlainOpen, cmn.Tr.GitconfigParseErr)
 	if err != nil {
-		return nil, utils.WrapError(err)
+		return nil, err
 	}
 
-	repository, err := gogit.PlainOpenWithOptions(
-		repoPaths.WorktreeGitDirPath(),
-		&gogit.PlainOpenOptions{DetectDotGit: false, EnableDotGitCommonDir: true},
-	)
+	dotGitDir, err := findDotGitDir(os.Stat, ioutil.ReadFile)
 	if err != nil {
-		if strings.Contains(err.Error(), `unquoted '\' must be followed by new line`) {
-			return nil, errors.New(cmn.Tr.GitconfigParseErr)
-		}
 		return nil, err
 	}
 
 	return NewGitCommandAux(
 		cmn,
-		version,
 		osCommand,
 		gitConfig,
-		repoPaths,
-		repository,
+		dotGitDir,
+		repo,
 	), nil
 }
 
 func NewGitCommandAux(
 	cmn *common.Common,
-	version *git_commands.GitVersion,
 	osCommand *oscommands.OSCommand,
 	gitConfig git_config.IGitConfig,
-	repoPaths *git_commands.RepoPaths,
+	dotGitDir string,
 	repo *gogit.Repository,
 ) *GitCommand {
 	cmd := NewGitCmdObjBuilder(cmn.Log, osCommand.Cmd)
@@ -105,51 +92,38 @@ func NewGitCommandAux(
 	// This is admittedly messy, but allows us to test each command struct in isolation,
 	// and allows for better namespacing when compared to having every method living
 	// on the one struct.
-	// common ones are: cmn, osCommand, dotGitDir, configCommands
 	configCommands := git_commands.NewConfigCommands(cmn, gitConfig, repo)
-
-	gitCommon := git_commands.NewGitCommon(cmn, version, cmd, osCommand, repoPaths, repo, configCommands)
-
-	fileLoader := git_commands.NewFileLoader(gitCommon, cmd, configCommands)
-	statusCommands := git_commands.NewStatusCommands(gitCommon)
-	flowCommands := git_commands.NewFlowCommands(gitCommon)
-	remoteCommands := git_commands.NewRemoteCommands(gitCommon)
-	branchCommands := git_commands.NewBranchCommands(gitCommon)
-	syncCommands := git_commands.NewSyncCommands(gitCommon)
-	tagCommands := git_commands.NewTagCommands(gitCommon)
-	commitCommands := git_commands.NewCommitCommands(gitCommon)
-	customCommands := git_commands.NewCustomCommands(gitCommon)
-	diffCommands := git_commands.NewDiffCommands(gitCommon)
-	fileCommands := git_commands.NewFileCommands(gitCommon)
-	submoduleCommands := git_commands.NewSubmoduleCommands(gitCommon)
-	workingTreeCommands := git_commands.NewWorkingTreeCommands(gitCommon, submoduleCommands, fileLoader)
-	rebaseCommands := git_commands.NewRebaseCommands(gitCommon, commitCommands, workingTreeCommands)
-	stashCommands := git_commands.NewStashCommands(gitCommon, fileLoader, workingTreeCommands)
-	patchBuilder := patch.NewPatchBuilder(cmn.Log,
-		func(from string, to string, reverse bool, filename string, plain bool) (string, error) {
-			return workingTreeCommands.ShowFileDiff(from, to, reverse, filename, plain)
-		})
-	patchCommands := git_commands.NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchBuilder)
-	bisectCommands := git_commands.NewBisectCommands(gitCommon)
-	worktreeCommands := git_commands.NewWorktreeCommands(gitCommon)
-	blameCommands := git_commands.NewBlameCommands(gitCommon)
-
-	branchLoader := git_commands.NewBranchLoader(cmn, gitCommon, cmd, branchCommands.CurrentBranchInfo, configCommands)
-	commitFileLoader := git_commands.NewCommitFileLoader(cmn, cmd)
-	commitLoader := git_commands.NewCommitLoader(cmn, cmd, statusCommands.RebaseMode, gitCommon)
-	reflogCommitLoader := git_commands.NewReflogCommitLoader(cmn, cmd)
-	remoteLoader := git_commands.NewRemoteLoader(cmn, cmd, repo.Remotes)
-	worktreeLoader := git_commands.NewWorktreeLoader(gitCommon)
-	stashLoader := git_commands.NewStashLoader(cmn, cmd)
-	tagLoader := git_commands.NewTagLoader(cmn, cmd)
+	statusCommands := git_commands.NewStatusCommands(cmn, osCommand, repo, dotGitDir)
+	fileLoader := loaders.NewFileLoader(cmn, cmd, configCommands)
+	flowCommands := git_commands.NewFlowCommands(cmn, cmd, configCommands)
+	remoteCommands := git_commands.NewRemoteCommands(cmn, cmd)
+	branchCommands := git_commands.NewBranchCommands(cmn, cmd)
+	syncCommands := git_commands.NewSyncCommands(cmn, cmd)
+	tagCommands := git_commands.NewTagCommands(cmn, cmd)
+	commitCommands := git_commands.NewCommitCommands(cmn, cmd)
+	customCommands := git_commands.NewCustomCommands(cmn, cmd)
+	fileCommands := git_commands.NewFileCommands(cmn, cmd, configCommands, osCommand)
+	submoduleCommands := git_commands.NewSubmoduleCommands(cmn, cmd, dotGitDir)
+	workingTreeCommands := git_commands.NewWorkingTreeCommands(cmn, cmd, submoduleCommands, osCommand, fileLoader)
+	rebaseCommands := git_commands.NewRebaseCommands(
+		cmn,
+		cmd,
+		osCommand,
+		commitCommands,
+		workingTreeCommands,
+		configCommands,
+		dotGitDir,
+	)
+	stashCommands := git_commands.NewStashCommands(cmn, cmd, osCommand, fileLoader, workingTreeCommands)
+	// TODO: have patch manager take workingTreeCommands in its entirety
+	patchManager := patch.NewPatchManager(cmn.Log, workingTreeCommands.ApplyPatch, workingTreeCommands.ShowFileDiff)
+	patchCommands := git_commands.NewPatchCommands(cmn, cmd, rebaseCommands, commitCommands, configCommands, statusCommands, patchManager)
 
 	return &GitCommand{
-		Blame:       blameCommands,
 		Branch:      branchCommands,
 		Commit:      commitCommands,
 		Config:      configCommands,
 		Custom:      customCommands,
-		Diff:        diffCommands,
 		File:        fileCommands,
 		Flow:        flowCommands,
 		Patch:       patchCommands,
@@ -160,25 +134,130 @@ func NewGitCommandAux(
 		Submodule:   submoduleCommands,
 		Sync:        syncCommands,
 		Tag:         tagCommands,
-		Bisect:      bisectCommands,
 		WorkingTree: workingTreeCommands,
-		Worktree:    worktreeCommands,
-		Version:     version,
 		Loaders: Loaders{
-			BranchLoader:       branchLoader,
-			CommitFileLoader:   commitFileLoader,
-			CommitLoader:       commitLoader,
-			FileLoader:         fileLoader,
-			ReflogCommitLoader: reflogCommitLoader,
-			RemoteLoader:       remoteLoader,
-			Worktrees:          worktreeLoader,
-			StashLoader:        stashLoader,
-			TagLoader:          tagLoader,
+			Branches:      loaders.NewBranchLoader(cmn, branchCommands.GetRawBranches, branchCommands.CurrentBranchName, configCommands),
+			CommitFiles:   loaders.NewCommitFileLoader(cmn, cmd),
+			Commits:       loaders.NewCommitLoader(cmn, cmd, dotGitDir, branchCommands.CurrentBranchName, statusCommands.RebaseMode),
+			Files:         fileLoader,
+			ReflogCommits: loaders.NewReflogCommitLoader(cmn, cmd),
+			Remotes:       loaders.NewRemoteLoader(cmn, cmd, repo.Remotes),
+			Stash:         loaders.NewStashLoader(cmn, cmd),
+			Tags:          loaders.NewTagLoader(cmn, cmd),
 		},
-		RepoPaths: repoPaths,
 	}
 }
 
-func VerifyInGitRepo(osCommand *oscommands.OSCommand) error {
-	return osCommand.Cmd.New(git_commands.NewGitCmd("rev-parse").Arg("--git-dir").ToArgv()).DontLog().Run()
+func navigateToRepoRootDirectory(stat func(string) (os.FileInfo, error), chdir func(string) error) error {
+	gitDir := env.GetGitDirEnv()
+	if gitDir != "" {
+		// we've been given the git directory explicitly so no need to navigate to it
+		_, err := stat(gitDir)
+		if err != nil {
+			return utils.WrapError(err)
+		}
+
+		return nil
+	}
+
+	// we haven't been given the git dir explicitly so we assume it's in the current working directory as `.git/` (or an ancestor directory)
+
+	for {
+		_, err := stat(".git")
+
+		if err == nil {
+			return nil
+		}
+
+		if !os.IsNotExist(err) {
+			return utils.WrapError(err)
+		}
+
+		if err = chdir(".."); err != nil {
+			return utils.WrapError(err)
+		}
+
+		currentPath, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+
+		atRoot := currentPath == filepath.Dir(currentPath)
+		if atRoot {
+			// we should never really land here: the code that creates GitCommand should
+			// verify we're in a git directory
+			return errors.New("Must open lazygit in a git repository")
+		}
+	}
+}
+
+// resolvePath takes a path containing a symlink and returns the true path
+func resolvePath(path string) (string, error) {
+	l, err := os.Lstat(path)
+	if err != nil {
+		return "", err
+	}
+
+	if l.Mode()&os.ModeSymlink == 0 {
+		return path, nil
+	}
+
+	return filepath.EvalSymlinks(path)
+}
+
+func setupRepository(openGitRepository func(string) (*gogit.Repository, error), gitConfigParseErrorStr string) (*gogit.Repository, error) {
+	unresolvedPath := env.GetGitDirEnv()
+	if unresolvedPath == "" {
+		var err error
+		unresolvedPath, err = os.Getwd()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	path, err := resolvePath(unresolvedPath)
+	if err != nil {
+		return nil, err
+	}
+
+	repository, err := openGitRepository(path)
+
+	if err != nil {
+		if strings.Contains(err.Error(), `unquoted '\' must be followed by new line`) {
+			return nil, errors.New(gitConfigParseErrorStr)
+		}
+
+		return nil, err
+	}
+
+	return repository, err
+}
+
+func findDotGitDir(stat func(string) (os.FileInfo, error), readFile func(filename string) ([]byte, error)) (string, error) {
+	if env.GetGitDirEnv() != "" {
+		return env.GetGitDirEnv(), nil
+	}
+
+	f, err := stat(".git")
+	if err != nil {
+		return "", err
+	}
+
+	if f.IsDir() {
+		return ".git", nil
+	}
+
+	fileBytes, err := readFile(".git")
+	if err != nil {
+		return "", err
+	}
+	fileContent := string(fileBytes)
+	if !strings.HasPrefix(fileContent, "gitdir: ") {
+		return "", errors.New(".git is a file which suggests we are in a submodule but the file's contents do not contain a gitdir pointing to the actual .git directory")
+	}
+	return strings.TrimSpace(strings.TrimPrefix(fileContent, "gitdir: ")), nil
+}
+
+func VerifyInGitRepo(osCommand *oscommands.OSCommand) error {
+	return osCommand.Cmd.New("git rev-parse --git-dir").DontLog().Run()
 }

pkg/commands/git_cmd_obj_builder.go

@@ -30,8 +30,12 @@ func NewGitCmdObjBuilder(log *logrus.Entry, innerBuilder *oscommands.CmdObjBuild
 
 var defaultEnvVar = "GIT_OPTIONAL_LOCKS=0"
 
-func (self *gitCmdObjBuilder) New(args []string) oscommands.ICmdObj {
-	return self.innerBuilder.New(args).AddEnvVars(defaultEnvVar)
+func (self *gitCmdObjBuilder) New(cmdStr string) oscommands.ICmdObj {
+	return self.innerBuilder.New(cmdStr).AddEnvVars(defaultEnvVar)
+}
+
+func (self *gitCmdObjBuilder) NewFromArgs(args []string) oscommands.ICmdObj {
+	return self.innerBuilder.NewFromArgs(args).AddEnvVars(defaultEnvVar)
 }
 
 func (self *gitCmdObjBuilder) NewShell(cmdStr string) oscommands.ICmdObj {

pkg/commands/git_cmd_obj_runner.go

@@ -10,11 +10,6 @@ import (
 
 // here we're wrapping the default command runner in some git-specific stuff e.g. retry logic if we get an error due to the presence of .git/index.lock
 
-const (
-	WaitTime   = 50 * time.Millisecond
-	RetryCount = 5
-)
-
 type gitCmdObjRunner struct {
 	log         *logrus.Entry
 	innerRunner oscommands.ICmdObjRunner
@@ -26,44 +21,29 @@ func (self *gitCmdObjRunner) Run(cmdObj oscommands.ICmdObj) error {
 }
 
 func (self *gitCmdObjRunner) RunWithOutput(cmdObj oscommands.ICmdObj) (string, error) {
-	var output string
-	var err error
-	for i := 0; i < RetryCount; i++ {
-		newCmdObj := cmdObj.Clone()
-		output, err = self.innerRunner.RunWithOutput(newCmdObj)
+	// TODO: have this retry logic in other places we run the command
+	waitTime := 50 * time.Millisecond
+	retryCount := 5
+	attempt := 0
 
-		if err == nil || !strings.Contains(output, ".git/index.lock") {
-			return output, err
+	for {
+		output, err := self.innerRunner.RunWithOutput(cmdObj)
+		if err != nil {
+			// if we have an error based on the index lock, we should wait a bit and then retry
+			if strings.Contains(output, ".git/index.lock") {
+				self.log.Error(output)
+				self.log.Info("index.lock prevented command from running. Retrying command after a small wait")
+				attempt++
+				time.Sleep(waitTime)
+				if attempt < retryCount {
+					continue
+				}
+			}
 		}
-
-		// if we have an error based on the index lock, we should wait a bit and then retry
-		self.log.Warn("index.lock prevented command from running. Retrying command after a small wait")
-		time.Sleep(WaitTime)
+		return output, err
 	}
-
-	return output, err
 }
 
-func (self *gitCmdObjRunner) RunWithOutputs(cmdObj oscommands.ICmdObj) (string, string, error) {
-	var stdout, stderr string
-	var err error
-	for i := 0; i < RetryCount; i++ {
-		newCmdObj := cmdObj.Clone()
-		stdout, stderr, err = self.innerRunner.RunWithOutputs(newCmdObj)
-
-		if err == nil || !strings.Contains(stdout+stderr, ".git/index.lock") {
-			return stdout, stderr, err
-		}
-
-		// if we have an error based on the index lock, we should wait a bit and then retry
-		self.log.Warn("index.lock prevented command from running. Retrying command after a small wait")
-		time.Sleep(WaitTime)
-	}
-
-	return stdout, stderr, err
-}
-
-// Retry logic not implemented here, but these commands typically don't need to obtain a lock.
 func (self *gitCmdObjRunner) RunAndProcessLines(cmdObj oscommands.ICmdObj, onLine func(line string) (bool, error)) error {
 	return self.innerRunner.RunAndProcessLines(cmdObj, onLine)
 }

pkg/commands/git_commands/bisect.go

@@ -1,194 +0,0 @@
-package git_commands
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-type BisectCommands struct {
-	*GitCommon
-}
-
-func NewBisectCommands(gitCommon *GitCommon) *BisectCommands {
-	return &BisectCommands{
-		GitCommon: gitCommon,
-	}
-}
-
-// This command is pretty cheap to run so we're not storing the result anywhere.
-// But if it becomes problematic we can chang that.
-func (self *BisectCommands) GetInfo() *BisectInfo {
-	return self.GetInfoForGitDir(self.repoPaths.WorktreeGitDirPath())
-}
-
-func (self *BisectCommands) GetInfoForGitDir(gitDir string) *BisectInfo {
-	var err error
-	info := &BisectInfo{started: false, log: self.Log, newTerm: "bad", oldTerm: "good"}
-	// we return nil if we're not in a git bisect session.
-	// we know we're in a session by the presence of a .git/BISECT_START file
-
-	bisectStartPath := filepath.Join(gitDir, "BISECT_START")
-	exists, err := self.os.FileExists(bisectStartPath)
-	if err != nil {
-		self.Log.Infof("error getting git bisect info: %s", err.Error())
-		return info
-	}
-
-	if !exists {
-		return info
-	}
-
-	startContent, err := os.ReadFile(bisectStartPath)
-	if err != nil {
-		self.Log.Infof("error getting git bisect info: %s", err.Error())
-		return info
-	}
-
-	info.started = true
-	info.start = strings.TrimSpace(string(startContent))
-
-	termsContent, err := os.ReadFile(filepath.Join(gitDir, "BISECT_TERMS"))
-	if err != nil {
-		// old git versions won't have this file so we default to bad/good
-	} else {
-		splitContent := strings.Split(string(termsContent), "\n")
-		info.newTerm = splitContent[0]
-		info.oldTerm = splitContent[1]
-	}
-
-	bisectRefsDir := filepath.Join(gitDir, "refs", "bisect")
-	files, err := os.ReadDir(bisectRefsDir)
-	if err != nil {
-		self.Log.Infof("error getting git bisect info: %s", err.Error())
-		return info
-	}
-
-	info.statusMap = make(map[string]BisectStatus)
-	for _, file := range files {
-		status := BisectStatusSkipped
-		name := file.Name()
-		path := filepath.Join(bisectRefsDir, name)
-
-		fileContent, err := os.ReadFile(path)
-		if err != nil {
-			self.Log.Infof("error getting git bisect info: %s", err.Error())
-			return info
-		}
-
-		hash := strings.TrimSpace(string(fileContent))
-
-		if name == info.newTerm {
-			status = BisectStatusNew
-		} else if strings.HasPrefix(name, info.oldTerm+"-") {
-			status = BisectStatusOld
-		} else if strings.HasPrefix(name, "skipped-") {
-			status = BisectStatusSkipped
-		}
-
-		info.statusMap[hash] = status
-	}
-
-	currentContent, err := os.ReadFile(filepath.Join(gitDir, "BISECT_EXPECTED_REV"))
-	if err != nil {
-		self.Log.Infof("error getting git bisect info: %s", err.Error())
-		return info
-	}
-	currentHash := strings.TrimSpace(string(currentContent))
-	info.current = currentHash
-
-	return info
-}
-
-func (self *BisectCommands) Reset() error {
-	cmdArgs := NewGitCmd("bisect").Arg("reset").ToArgv()
-
-	return self.cmd.New(cmdArgs).StreamOutput().Run()
-}
-
-func (self *BisectCommands) Mark(ref string, term string) error {
-	cmdArgs := NewGitCmd("bisect").Arg(term, ref).ToArgv()
-
-	return self.cmd.New(cmdArgs).
-		IgnoreEmptyError().
-		StreamOutput().
-		Run()
-}
-
-func (self *BisectCommands) Skip(ref string) error {
-	return self.Mark(ref, "skip")
-}
-
-func (self *BisectCommands) Start() error {
-	cmdArgs := NewGitCmd("bisect").Arg("start").ToArgv()
-
-	return self.cmd.New(cmdArgs).StreamOutput().Run()
-}
-
-func (self *BisectCommands) StartWithTerms(oldTerm string, newTerm string) error {
-	cmdArgs := NewGitCmd("bisect").Arg("start").
-		Arg("--term-old=" + oldTerm).
-		Arg("--term-new=" + newTerm).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).StreamOutput().Run()
-}
-
-// tells us whether we've found our problem commit(s). We return a string slice of
-// commit hashes if we're done, and that slice may have more that one item if
-// skipped commits are involved.
-func (self *BisectCommands) IsDone() (bool, []string, error) {
-	info := self.GetInfo()
-	if !info.Bisecting() {
-		return false, nil, nil
-	}
-
-	newHash := info.GetNewHash()
-	if newHash == "" {
-		return false, nil, nil
-	}
-
-	// if we start from the new commit and reach the a good commit without
-	// coming across any unprocessed commits, then we're done
-	done := false
-	candidates := []string{}
-
-	cmdArgs := NewGitCmd("rev-list").Arg(newHash).ToArgv()
-	err := self.cmd.New(cmdArgs).RunAndProcessLines(func(line string) (bool, error) {
-		hash := strings.TrimSpace(line)
-
-		if status, ok := info.statusMap[hash]; ok {
-			switch status {
-			case BisectStatusSkipped, BisectStatusNew:
-				candidates = append(candidates, hash)
-				return false, nil
-			case BisectStatusOld:
-				done = true
-				return true, nil
-			}
-		} else {
-			return true, nil
-		}
-
-		// should never land here
-		return true, nil
-	})
-	if err != nil {
-		return false, nil, err
-	}
-
-	return done, candidates, nil
-}
-
-// tells us whether the 'start' ref that we'll be sent back to after we're done
-// bisecting is actually a descendant of our current bisect commit. If it's not, we need to
-// render the commits from the bad commit.
-func (self *BisectCommands) ReachableFromStart(bisectInfo *BisectInfo) bool {
-	cmdArgs := NewGitCmd("merge-base").
-		Arg("--is-ancestor", bisectInfo.GetNewHash(), bisectInfo.GetStartHash()).
-		ToArgv()
-
-	err := self.cmd.New(cmdArgs).DontLog().Run()
-
-	return err == nil
-}

pkg/commands/git_commands/bisect_info.go

@@ -1,101 +0,0 @@
-package git_commands
-
-import (
-	"github.com/jesseduffield/generics/maps"
-	"github.com/samber/lo"
-	"github.com/sirupsen/logrus"
-)
-
-// although the typical terms in a git bisect are 'bad' and 'good', they're more
-// generally known as 'new' and 'old'. Semi-recently git allowed the user to define
-// their own terms e.g. when you want to used 'fixed', 'unfixed' in the event
-// that you're looking for a commit that fixed a bug.
-
-// Git bisect only keeps track of a single 'bad' commit. Once you pick a commit
-// that's older than the current bad one, it forgets about the previous one. On
-// the other hand, it does keep track of all the good and skipped commits.
-
-type BisectInfo struct {
-	log *logrus.Entry
-
-	// tells us whether all our git bisect files are there meaning we're in bisect mode.
-	// Doesn't necessarily mean that we've actually picked a good/bad commit yet.
-	started bool
-
-	// this is the ref you started the commit from
-	start string // this will always be defined
-
-	// these will be defined if we've started
-	newTerm string // 'bad' by default
-	oldTerm string // 'good' by default
-
-	// map of commit hashes to their status
-	statusMap map[string]BisectStatus
-
-	// the hash of the commit that's under test
-	current string
-}
-
-type BisectStatus int
-
-const (
-	BisectStatusOld BisectStatus = iota
-	BisectStatusNew
-	BisectStatusSkipped
-)
-
-// null object pattern
-func NewNullBisectInfo() *BisectInfo {
-	return &BisectInfo{started: false}
-}
-
-func (self *BisectInfo) GetNewHash() string {
-	for hash, status := range self.statusMap {
-		if status == BisectStatusNew {
-			return hash
-		}
-	}
-
-	return ""
-}
-
-func (self *BisectInfo) GetCurrentHash() string {
-	return self.current
-}
-
-func (self *BisectInfo) GetStartHash() string {
-	return self.start
-}
-
-func (self *BisectInfo) Status(commitHash string) (BisectStatus, bool) {
-	status, ok := self.statusMap[commitHash]
-	return status, ok
-}
-
-func (self *BisectInfo) NewTerm() string {
-	return self.newTerm
-}
-
-func (self *BisectInfo) OldTerm() string {
-	return self.oldTerm
-}
-
-// this is for when we have called `git bisect start`. It does not
-// mean that we have actually started narrowing things down or selecting good/bad commits
-func (self *BisectInfo) Started() bool {
-	return self.started
-}
-
-// this is where we have both a good and bad revision and we're actually
-// starting to narrow things down
-func (self *BisectInfo) Bisecting() bool {
-	if !self.Started() {
-		return false
-	}
-
-	if self.GetNewHash() == "" {
-		return false
-	}
-
-	return lo.Contains(maps.Values(self.statusMap), BisectStatusOld)
-}

pkg/commands/git_commands/blame.go

@@ -1,33 +0,0 @@
-package git_commands
-
-import (
-	"fmt"
-)
-
-type BlameCommands struct {
-	*GitCommon
-}
-
-func NewBlameCommands(gitCommon *GitCommon) *BlameCommands {
-	return &BlameCommands{
-		GitCommon: gitCommon,
-	}
-}
-
-// Blame a range of lines. For each line, output the hash of the commit where
-// the line last changed, then a space, then a description of the commit (author
-// and date), another space, and then the line. For example:
-//
-//	ac90ebac688fe8bc2ffd922157a9d2c54681d2aa (Stefan Haller 2023-08-01 14:54:56 +0200 11) func NewBlameCommands(gitCommon *GitCommon) *BlameCommands {
-//	ac90ebac688fe8bc2ffd922157a9d2c54681d2aa (Stefan Haller 2023-08-01 14:54:56 +0200 12) 	return &BlameCommands{
-//	ac90ebac688fe8bc2ffd922157a9d2c54681d2aa (Stefan Haller 2023-08-01 14:54:56 +0200 13) 		GitCommon: gitCommon,
-func (self *BlameCommands) BlameLineRange(filename string, commit string, firstLine int, numLines int) (string, error) {
-	cmdArgs := NewGitCmd("blame").
-		Arg("-l").
-		Arg(fmt.Sprintf("-L%d,+%d", firstLine, numLines)).
-		Arg(commit).
-		Arg("--").
-		Arg(filename)
-
-	return self.cmd.New(cmdArgs.ToArgv()).RunWithOutput()
-}

pkg/commands/git_commands/branch.go

@@ -2,108 +2,75 @@ package git_commands
 
 import (
 	"fmt"
+	"regexp"
 	"strings"
 
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/mgutz/str"
 )
 
+// this takes something like:
+// * (HEAD detached at 264fc6f5)
+//	remotes
+// and returns '264fc6f5' as the second match
+const CurrentBranchNameRegex = `(?m)^\*.*?([^ ]*?)\)?$`
+
 type BranchCommands struct {
-	*GitCommon
+	*common.Common
+
+	cmd oscommands.ICmdObjBuilder
 }
 
-func NewBranchCommands(gitCommon *GitCommon) *BranchCommands {
+func NewBranchCommands(
+	common *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+) *BranchCommands {
 	return &BranchCommands{
-		GitCommon: gitCommon,
+		Common: common,
+		cmd:    cmd,
 	}
 }
 
 // New creates a new branch
 func (self *BranchCommands) New(name string, base string) error {
-	cmdArgs := NewGitCmd("checkout").
-		Arg("-b", name, base).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(fmt.Sprintf("git checkout -b %s %s", self.cmd.Quote(name), self.cmd.Quote(base))).Run()
 }
 
-// CreateWithUpstream creates a new branch with a given upstream, but without
-// checking it out
-func (self *BranchCommands) CreateWithUpstream(name string, upstream string) error {
-	cmdArgs := NewGitCmd("branch").
-		Arg("--track").
-		Arg(name, upstream).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-// CurrentBranchInfo get the current branch information.
-func (self *BranchCommands) CurrentBranchInfo() (BranchInfo, error) {
-	branchName, err := self.cmd.New(
-		NewGitCmd("symbolic-ref").
-			Arg("--short", "HEAD").
-			ToArgv(),
-	).DontLog().RunWithOutput()
+// CurrentBranchName get the current branch name and displayname.
+// the first returned string is the name and the second is the displayname
+// e.g. name is 123asdf and displayname is '(HEAD detached at 123asdf)'
+func (self *BranchCommands) CurrentBranchName() (string, string, error) {
+	branchName, err := self.cmd.New("git symbolic-ref --short HEAD").DontLog().RunWithOutput()
 	if err == nil && branchName != "HEAD\n" {
 		trimmedBranchName := strings.TrimSpace(branchName)
-		return BranchInfo{
-			RefName:      trimmedBranchName,
-			DisplayName:  trimmedBranchName,
-			DetachedHead: false,
-		}, nil
+		return trimmedBranchName, trimmedBranchName, nil
 	}
-	output, err := self.cmd.New(
-		NewGitCmd("branch").
-			Arg("--points-at=HEAD", "--format=%(HEAD)%00%(objectname)%00%(refname)").
-			ToArgv(),
-	).DontLog().RunWithOutput()
+	output, err := self.cmd.New("git branch --contains").DontLog().RunWithOutput()
 	if err != nil {
-		return BranchInfo{}, err
+		return "", "", err
 	}
 	for _, line := range utils.SplitLines(output) {
-		split := strings.Split(strings.TrimRight(line, "\r\n"), "\x00")
-		if len(split) == 3 && split[0] == "*" {
-			hash := split[1]
-			displayName := split[2]
-			return BranchInfo{
-				RefName:      hash,
-				DisplayName:  displayName,
-				DetachedHead: true,
-			}, nil
+		re := regexp.MustCompile(CurrentBranchNameRegex)
+		match := re.FindStringSubmatch(line)
+		if len(match) > 0 {
+			branchName = match[1]
+			displayBranchName := match[0][2:]
+			return branchName, displayBranchName, nil
 		}
 	}
-	return BranchInfo{
-		RefName:      "HEAD",
-		DisplayName:  "HEAD",
-		DetachedHead: true,
-	}, nil
+	return "HEAD", "HEAD", nil
 }
 
-// CurrentBranchName get name of current branch
-func (self *BranchCommands) CurrentBranchName() (string, error) {
-	cmdArgs := NewGitCmd("rev-parse").
-		Arg("--abbrev-ref").
-		Arg("--verify").
-		Arg("HEAD").
-		ToArgv()
+// Delete delete branch
+func (self *BranchCommands) Delete(branch string, force bool) error {
+	command := "git branch -d"
 
-	output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	if err == nil {
-		return strings.TrimSpace(output), nil
+	if force {
+		command = "git branch -D"
 	}
-	return "", err
-}
 
-// LocalDelete delete branch locally
-func (self *BranchCommands) LocalDelete(branch string, force bool) error {
-	cmdArgs := NewGitCmd("branch").
-		ArgIfElse(force, "-D", "-d").
-		Arg(branch).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(fmt.Sprintf("%s %s", command, self.cmd.Quote(branch))).Run()
 }
 
 // Checkout checks out a branch (or commit), with --force if you set the force arg to true
@@ -113,12 +80,12 @@ type CheckoutOptions struct {
 }
 
 func (self *BranchCommands) Checkout(branch string, options CheckoutOptions) error {
-	cmdArgs := NewGitCmd("checkout").
-		ArgIf(options.Force, "--force").
-		Arg(branch).
-		ToArgv()
+	forceArg := ""
+	if options.Force {
+		forceArg = " --force"
+	}
 
-	return self.cmd.New(cmdArgs).
+	return self.cmd.New(fmt.Sprintf("git checkout%s %s", forceArg, self.cmd.Quote(branch))).
 		// prevents git from prompting us for input which would freeze the program
 		// TODO: see if this is actually needed here
 		AddEnvVars("GIT_TERMINAL_PROMPT=0").
@@ -138,34 +105,15 @@ func (self *BranchCommands) GetGraphCmdObj(branchName string) oscommands.ICmdObj
 	templateValues := map[string]string{
 		"branchName": self.cmd.Quote(branchName),
 	}
-
-	resolvedTemplate := utils.ResolvePlaceholderString(branchLogCmdTemplate, templateValues)
-
-	return self.cmd.New(str.ToArgv(resolvedTemplate)).DontLog()
+	return self.cmd.New(utils.ResolvePlaceholderString(branchLogCmdTemplate, templateValues)).DontLog()
 }
 
 func (self *BranchCommands) SetCurrentBranchUpstream(remoteName string, remoteBranchName string) error {
-	cmdArgs := NewGitCmd("branch").
-		Arg(fmt.Sprintf("--set-upstream-to=%s/%s", remoteName, remoteBranchName)).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(fmt.Sprintf("git branch --set-upstream-to=%s/%s", self.cmd.Quote(remoteName), self.cmd.Quote(remoteBranchName))).Run()
 }
 
 func (self *BranchCommands) SetUpstream(remoteName string, remoteBranchName string, branchName string) error {
-	cmdArgs := NewGitCmd("branch").
-		Arg(fmt.Sprintf("--set-upstream-to=%s/%s", remoteName, remoteBranchName)).
-		Arg(branchName).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-func (self *BranchCommands) UnsetUpstream(branchName string) error {
-	cmdArgs := NewGitCmd("branch").Arg("--unset-upstream", branchName).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(fmt.Sprintf("git branch --set-upstream-to=%s/%s %s", self.cmd.Quote(remoteName), self.cmd.Quote(remoteBranchName), self.cmd.Quote(branchName))).Run()
 }
 
 func (self *BranchCommands) GetCurrentBranchUpstreamDifferenceCount() (string, string) {
@@ -179,39 +127,29 @@ func (self *BranchCommands) GetUpstreamDifferenceCount(branchName string) (strin
 // GetCommitDifferences checks how many pushables/pullables there are for the
 // current branch
 func (self *BranchCommands) GetCommitDifferences(from, to string) (string, string) {
-	pushableCount, err := self.countDifferences(to, from)
+	command := "git rev-list %s..%s --count"
+	pushableCount, err := self.cmd.New(fmt.Sprintf(command, to, from)).DontLog().RunWithOutput()
 	if err != nil {
 		return "?", "?"
 	}
-	pullableCount, err := self.countDifferences(from, to)
+	pullableCount, err := self.cmd.New(fmt.Sprintf(command, from, to)).DontLog().RunWithOutput()
 	if err != nil {
 		return "?", "?"
 	}
 	return strings.TrimSpace(pushableCount), strings.TrimSpace(pullableCount)
 }
 
-func (self *BranchCommands) countDifferences(from, to string) (string, error) {
-	cmdArgs := NewGitCmd("rev-list").
-		Arg(fmt.Sprintf("%s..%s", from, to)).
-		Arg("--count").
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-}
-
 func (self *BranchCommands) IsHeadDetached() bool {
-	cmdArgs := NewGitCmd("symbolic-ref").Arg("-q", "HEAD").ToArgv()
-
-	err := self.cmd.New(cmdArgs).DontLog().Run()
+	err := self.cmd.New("git symbolic-ref -q HEAD").DontLog().Run()
 	return err != nil
 }
 
 func (self *BranchCommands) Rename(oldName string, newName string) error {
-	cmdArgs := NewGitCmd("branch").
-		Arg("--move", oldName, newName).
-		ToArgv()
+	return self.cmd.New(fmt.Sprintf("git branch --move %s %s", self.cmd.Quote(oldName), self.cmd.Quote(newName))).Run()
+}
 
-	return self.cmd.New(cmdArgs).Run()
+func (self *BranchCommands) GetRawBranches() (string, error) {
+	return self.cmd.New(`git for-each-ref --sort=-committerdate --format="%(HEAD)|%(refname:short)|%(upstream:short)|%(upstream:track)" refs/heads`).DontLog().RunWithOutput()
 }
 
 type MergeOpts struct {
@@ -219,16 +157,19 @@ type MergeOpts struct {
 }
 
 func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error {
-	cmdArgs := NewGitCmd("merge").
-		Arg("--no-edit").
-		Arg(strings.Fields(self.UserConfig.Git.Merging.Args)...).
-		ArgIf(opts.FastForwardOnly, "--ff-only").
-		Arg(branchName).
-		ToArgv()
+	mergeArg := ""
+	if self.UserConfig.Git.Merging.Args != "" {
+		mergeArg = " " + self.UserConfig.Git.Merging.Args
+	}
 
-	return self.cmd.New(cmdArgs).Run()
+	command := fmt.Sprintf("git merge --no-edit%s %s", mergeArg, self.cmd.Quote(branchName))
+	if opts.FastForwardOnly {
+		command = fmt.Sprintf("%s --ff-only", command)
+	}
+
+	return self.cmd.New(command).Run()
 }
 
 func (self *BranchCommands) AllBranchesLogCmdObj() oscommands.ICmdObj {
-	return self.cmd.New(str.ToArgv(self.UserConfig.Git.AllBranchesLogCmd)).DontLog()
+	return self.cmd.New(self.UserConfig.Git.AllBranchesLogCmd).DontLog()
 }

pkg/commands/git_commands/branch_loader.go

@@ -1,394 +0,0 @@
-package git_commands
-
-import (
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/jesseduffield/generics/set"
-	"github.com/jesseduffield/go-git/v5/config"
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/common"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
-	"golang.org/x/exp/slices"
-	"golang.org/x/sync/errgroup"
-)
-
-// context:
-// we want to only show 'safe' branches (ones that haven't e.g. been deleted)
-// which `git branch -a` gives us, but we also want the recency data that
-// git reflog gives us.
-// So we get the HEAD, then append get the reflog branches that intersect with
-// our safe branches, then add the remaining safe branches, ensuring uniqueness
-// along the way
-
-// if we find out we need to use one of these functions in the git.go file, we
-// can just pull them out of here and put them there and then call them from in here
-
-type BranchLoaderConfigCommands interface {
-	Branches() (map[string]*config.Branch, error)
-}
-
-type BranchInfo struct {
-	RefName      string
-	DisplayName  string // e.g. '(HEAD detached at 123asdf)'
-	DetachedHead bool
-}
-
-// BranchLoader returns a list of Branch objects for the current repo
-type BranchLoader struct {
-	*common.Common
-	*GitCommon
-	cmd                  oscommands.ICmdObjBuilder
-	getCurrentBranchInfo func() (BranchInfo, error)
-	config               BranchLoaderConfigCommands
-}
-
-func NewBranchLoader(
-	cmn *common.Common,
-	gitCommon *GitCommon,
-	cmd oscommands.ICmdObjBuilder,
-	getCurrentBranchInfo func() (BranchInfo, error),
-	config BranchLoaderConfigCommands,
-) *BranchLoader {
-	return &BranchLoader{
-		Common:               cmn,
-		GitCommon:            gitCommon,
-		cmd:                  cmd,
-		getCurrentBranchInfo: getCurrentBranchInfo,
-		config:               config,
-	}
-}
-
-// Load the list of branches for the current repo
-func (self *BranchLoader) Load(reflogCommits []*models.Commit,
-	mainBranches *MainBranches,
-	oldBranches []*models.Branch,
-	loadBehindCounts bool,
-	onWorker func(func() error),
-	renderFunc func(),
-) ([]*models.Branch, error) {
-	branches := self.obtainBranches(self.version.IsAtLeast(2, 22, 0))
-
-	if self.AppState.LocalBranchSortOrder == "recency" {
-		reflogBranches := self.obtainReflogBranches(reflogCommits)
-		// loop through reflog branches. If there is a match, merge them, then remove it from the branches and keep it in the reflog branches
-		branchesWithRecency := make([]*models.Branch, 0)
-	outer:
-		for _, reflogBranch := range reflogBranches {
-			for j, branch := range branches {
-				if branch.Head {
-					continue
-				}
-				if strings.EqualFold(reflogBranch.Name, branch.Name) {
-					branch.Recency = reflogBranch.Recency
-					branchesWithRecency = append(branchesWithRecency, branch)
-					branches = utils.Remove(branches, j)
-					continue outer
-				}
-			}
-		}
-
-		// Sort branches that don't have a recency value alphabetically
-		// (we're really doing this for the sake of deterministic behaviour across git versions)
-		slices.SortFunc(branches, func(a *models.Branch, b *models.Branch) bool {
-			return a.Name < b.Name
-		})
-
-		branches = utils.Prepend(branches, branchesWithRecency...)
-	}
-
-	foundHead := false
-	for i, branch := range branches {
-		if branch.Head {
-			foundHead = true
-			branch.Recency = "  *"
-			branches = utils.Move(branches, i, 0)
-			break
-		}
-	}
-	if !foundHead {
-		info, err := self.getCurrentBranchInfo()
-		if err != nil {
-			return nil, err
-		}
-		branches = utils.Prepend(branches, &models.Branch{Name: info.RefName, DisplayName: info.DisplayName, Head: true, DetachedHead: info.DetachedHead, Recency: "  *"})
-	}
-
-	configBranches, err := self.config.Branches()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, branch := range branches {
-		match := configBranches[branch.Name]
-		if match != nil {
-			branch.UpstreamRemote = match.Remote
-			branch.UpstreamBranch = match.Merge.Short()
-		}
-
-		// If the branch already existed, take over its BehindBaseBranch value
-		// to reduce flicker
-		if oldBranch, found := lo.Find(oldBranches, func(b *models.Branch) bool {
-			return b.Name == branch.Name
-		}); found {
-			branch.BehindBaseBranch.Store(oldBranch.BehindBaseBranch.Load())
-		}
-	}
-
-	if loadBehindCounts && self.UserConfig.Gui.ShowDivergenceFromBaseBranch != "none" {
-		onWorker(func() error {
-			return self.GetBehindBaseBranchValuesForAllBranches(branches, mainBranches, renderFunc)
-		})
-	}
-
-	return branches, nil
-}
-
-func (self *BranchLoader) GetBehindBaseBranchValuesForAllBranches(
-	branches []*models.Branch,
-	mainBranches *MainBranches,
-	renderFunc func(),
-) error {
-	mainBranchRefs := mainBranches.Get()
-	if len(mainBranchRefs) == 0 {
-		return nil
-	}
-
-	t := time.Now()
-	errg := errgroup.Group{}
-
-	for _, branch := range branches {
-		errg.Go(func() error {
-			baseBranch, err := self.GetBaseBranch(branch, mainBranches)
-			if err != nil {
-				return err
-			}
-			behind := 0 // prime it in case something below fails
-			if baseBranch != "" {
-				output, err := self.cmd.New(
-					NewGitCmd("rev-list").
-						Arg("--left-right").
-						Arg("--count").
-						Arg(fmt.Sprintf("%s...%s", branch.FullRefName(), baseBranch)).
-						ToArgv(),
-				).DontLog().RunWithOutput()
-				if err != nil {
-					return err
-				}
-				// The format of the output is "<ahead>\t<behind>"
-				aheadBehindStr := strings.Split(strings.TrimSpace(output), "\t")
-				if len(aheadBehindStr) == 2 {
-					if value, err := strconv.Atoi(aheadBehindStr[1]); err == nil {
-						behind = value
-					}
-				}
-			}
-			branch.BehindBaseBranch.Store(int32(behind))
-			return nil
-		})
-	}
-
-	err := errg.Wait()
-	self.Log.Debugf("time to get behind base branch values for all branches: %s", time.Since(t))
-	renderFunc()
-	return err
-}
-
-// Find the base branch for the given branch (i.e. the main branch that the
-// given branch was forked off of)
-//
-// Note that this function may return an empty string even if the returned error
-// is nil, e.g. when none of the configured main branches exist. This is not
-// considered an error condition, so callers need to check both the returned
-// error and whether the returned base branch is empty (and possibly react
-// differently in both cases).
-func (self *BranchLoader) GetBaseBranch(branch *models.Branch, mainBranches *MainBranches) (string, error) {
-	mergeBase := mainBranches.GetMergeBase(branch.FullRefName())
-	if mergeBase == "" {
-		return "", nil
-	}
-
-	output, err := self.cmd.New(
-		NewGitCmd("for-each-ref").
-			Arg("--contains").
-			Arg(mergeBase).
-			Arg("--format=%(refname)").
-			Arg(mainBranches.Get()...).
-			ToArgv(),
-	).DontLog().RunWithOutput()
-	if err != nil {
-		return "", err
-	}
-	trimmedOutput := strings.TrimSpace(output)
-	split := strings.Split(trimmedOutput, "\n")
-	if len(split) == 0 || split[0] == "" {
-		return "", nil
-	}
-	return split[0], nil
-}
-
-func (self *BranchLoader) obtainBranches(canUsePushTrack bool) []*models.Branch {
-	output, err := self.getRawBranches()
-	if err != nil {
-		panic(err)
-	}
-
-	trimmedOutput := strings.TrimSpace(output)
-	outputLines := strings.Split(trimmedOutput, "\n")
-
-	return lo.FilterMap(outputLines, func(line string, _ int) (*models.Branch, bool) {
-		if line == "" {
-			return nil, false
-		}
-
-		split := strings.Split(line, "\x00")
-		if len(split) != len(branchFields) {
-			// Ignore line if it isn't separated into the expected number of parts
-			// This is probably a warning message, for more info see:
-			// https://github.com/jesseduffield/lazygit/issues/1385#issuecomment-885580439
-			return nil, false
-		}
-
-		storeCommitDateAsRecency := self.AppState.LocalBranchSortOrder != "recency"
-		return obtainBranch(split, storeCommitDateAsRecency, canUsePushTrack), true
-	})
-}
-
-func (self *BranchLoader) getRawBranches() (string, error) {
-	format := strings.Join(
-		lo.Map(branchFields, func(thing string, _ int) string {
-			return "%(" + thing + ")"
-		}),
-		"%00",
-	)
-
-	var sortOrder string
-	switch strings.ToLower(self.AppState.LocalBranchSortOrder) {
-	case "recency", "date":
-		sortOrder = "-committerdate"
-	case "alphabetical":
-		sortOrder = "refname"
-	default:
-		sortOrder = "refname"
-	}
-
-	cmdArgs := NewGitCmd("for-each-ref").
-		Arg(fmt.Sprintf("--sort=%s", sortOrder)).
-		Arg(fmt.Sprintf("--format=%s", format)).
-		Arg("refs/heads").
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-}
-
-var branchFields = []string{
-	"HEAD",
-	"refname:short",
-	"upstream:short",
-	"upstream:track",
-	"push:track",
-	"subject",
-	"objectname",
-	"committerdate:unix",
-}
-
-// Obtain branch information from parsed line output of getRawBranches()
-func obtainBranch(split []string, storeCommitDateAsRecency bool, canUsePushTrack bool) *models.Branch {
-	headMarker := split[0]
-	fullName := split[1]
-	upstreamName := split[2]
-	track := split[3]
-	pushTrack := split[4]
-	subject := split[5]
-	commitHash := split[6]
-	commitDate := split[7]
-
-	name := strings.TrimPrefix(fullName, "heads/")
-	aheadForPull, behindForPull, gone := parseUpstreamInfo(upstreamName, track)
-	var aheadForPush, behindForPush string
-	if canUsePushTrack {
-		aheadForPush, behindForPush, _ = parseUpstreamInfo(upstreamName, pushTrack)
-	} else {
-		aheadForPush, behindForPush = aheadForPull, behindForPull
-	}
-
-	recency := ""
-	if storeCommitDateAsRecency {
-		if unixTimestamp, err := strconv.ParseInt(commitDate, 10, 64); err == nil {
-			recency = utils.UnixToTimeAgo(unixTimestamp)
-		}
-	}
-
-	return &models.Branch{
-		Name:          name,
-		Recency:       recency,
-		AheadForPull:  aheadForPull,
-		BehindForPull: behindForPull,
-		AheadForPush:  aheadForPush,
-		BehindForPush: behindForPush,
-		UpstreamGone:  gone,
-		Head:          headMarker == "*",
-		Subject:       subject,
-		CommitHash:    commitHash,
-	}
-}
-
-func parseUpstreamInfo(upstreamName string, track string) (string, string, bool) {
-	if upstreamName == "" {
-		// if we're here then it means we do not have a local version of the remote.
-		// The branch might still be tracking a remote though, we just don't know
-		// how many commits ahead/behind it is
-		return "?", "?", false
-	}
-
-	if track == "[gone]" {
-		return "?", "?", true
-	}
-
-	ahead := parseDifference(track, `ahead (\d+)`)
-	behind := parseDifference(track, `behind (\d+)`)
-
-	return ahead, behind, false
-}
-
-func parseDifference(track string, regexStr string) string {
-	re := regexp.MustCompile(regexStr)
-	match := re.FindStringSubmatch(track)
-	if len(match) > 1 {
-		return match[1]
-	} else {
-		return "0"
-	}
-}
-
-// TODO: only look at the new reflog commits, and otherwise store the recencies in
-// int form against the branch to recalculate the time ago
-func (self *BranchLoader) obtainReflogBranches(reflogCommits []*models.Commit) []*models.Branch {
-	foundBranches := set.New[string]()
-	re := regexp.MustCompile(`checkout: moving from ([\S]+) to ([\S]+)`)
-	reflogBranches := make([]*models.Branch, 0, len(reflogCommits))
-
-	for _, commit := range reflogCommits {
-		match := re.FindStringSubmatch(commit.Name)
-		if len(match) != 3 {
-			continue
-		}
-
-		recency := utils.UnixToTimeAgo(commit.UnixTimestamp)
-		for _, branchName := range match[1:] {
-			if !foundBranches.Includes(branchName) {
-				foundBranches.Add(branchName)
-				reflogBranches = append(reflogBranches, &models.Branch{
-					Recency: recency,
-					Name:    branchName,
-				})
-			}
-		}
-	}
-	return reflogBranches
-}

pkg/commands/git_commands/branch_loader_test.go

@@ -1,126 +0,0 @@
-package git_commands
-
-// "*|feat/detect-purge|origin/feat/detect-purge|[ahead 1]"
-import (
-	"strconv"
-	"testing"
-	"time"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestObtainBranch(t *testing.T) {
-	type scenario struct {
-		testName                 string
-		input                    []string
-		storeCommitDateAsRecency bool
-		expectedBranch           *models.Branch
-	}
-
-	// Use a time stamp of 2 1/2 hours ago, resulting in a recency string of "2h"
-	now := time.Now().Unix()
-	timeStamp := strconv.Itoa(int(now - 2.5*60*60))
-
-	scenarios := []scenario{
-		{
-			testName:                 "TrimHeads",
-			input:                    []string{"", "heads/a_branch", "", "", "", "subject", "123", timeStamp},
-			storeCommitDateAsRecency: false,
-			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				AheadForPull:  "?",
-				BehindForPull: "?",
-				AheadForPush:  "?",
-				BehindForPush: "?",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
-			},
-		},
-		{
-			testName:                 "NoUpstream",
-			input:                    []string{"", "a_branch", "", "", "", "subject", "123", timeStamp},
-			storeCommitDateAsRecency: false,
-			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				AheadForPull:  "?",
-				BehindForPull: "?",
-				AheadForPush:  "?",
-				BehindForPush: "?",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
-			},
-		},
-		{
-			testName:                 "IsHead",
-			input:                    []string{"*", "a_branch", "", "", "", "subject", "123", timeStamp},
-			storeCommitDateAsRecency: false,
-			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				AheadForPull:  "?",
-				BehindForPull: "?",
-				AheadForPush:  "?",
-				BehindForPush: "?",
-				Head:          true,
-				Subject:       "subject",
-				CommitHash:    "123",
-			},
-		},
-		{
-			testName:                 "IsBehindAndAhead",
-			input:                    []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]", "[behind 2, ahead 3]", "subject", "123", timeStamp},
-			storeCommitDateAsRecency: false,
-			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				AheadForPull:  "3",
-				BehindForPull: "2",
-				AheadForPush:  "3",
-				BehindForPush: "2",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
-			},
-		},
-		{
-			testName:                 "RemoteBranchIsGone",
-			input:                    []string{"", "a_branch", "a_remote/a_branch", "[gone]", "[gone]", "subject", "123", timeStamp},
-			storeCommitDateAsRecency: false,
-			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				UpstreamGone:  true,
-				AheadForPull:  "?",
-				BehindForPull: "?",
-				AheadForPush:  "?",
-				BehindForPush: "?",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
-			},
-		},
-		{
-			testName:                 "WithCommitDateAsRecency",
-			input:                    []string{"", "a_branch", "", "", "", "subject", "123", timeStamp},
-			storeCommitDateAsRecency: true,
-			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				Recency:       "2h",
-				AheadForPull:  "?",
-				BehindForPull: "?",
-				AheadForPush:  "?",
-				BehindForPush: "?",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			branch := obtainBranch(s.input, s.storeCommitDateAsRecency, true)
-			assert.EqualValues(t, s.expectedBranch, branch)
-		})
-	}
-}

pkg/commands/git_commands/branch_test.go

@@ -5,10 +5,15 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 
+func NewBranchCommandsWithRunner(runner *oscommands.FakeCmdObjRunner) *BranchCommands {
+	builder := oscommands.NewDummyCmdObjBuilder(runner)
+	return NewBranchCommands(utils.NewDummyCommon(), builder)
+}
+
 func TestBranchGetCommitDifferences(t *testing.T) {
 	type scenario struct {
 		testName          string
@@ -21,28 +26,29 @@ func TestBranchGetCommitDifferences(t *testing.T) {
 		{
 			"Can't retrieve pushable count",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rev-list", "@{u}..HEAD", "--count"}, "", errors.New("error")),
+				Expect("git rev-list @{u}..HEAD --count", "", errors.New("error")),
 			"?", "?",
 		},
 		{
 			"Can't retrieve pullable count",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rev-list", "@{u}..HEAD", "--count"}, "1\n", nil).
-				ExpectGitArgs([]string{"rev-list", "HEAD..@{u}", "--count"}, "", errors.New("error")),
+				Expect("git rev-list @{u}..HEAD --count", "1\n", nil).
+				Expect("git rev-list HEAD..@{u} --count", "", errors.New("error")),
 			"?", "?",
 		},
 		{
 			"Retrieve pullable and pushable count",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rev-list", "@{u}..HEAD", "--count"}, "1\n", nil).
-				ExpectGitArgs([]string{"rev-list", "HEAD..@{u}", "--count"}, "2\n", nil),
+				Expect("git rev-list @{u}..HEAD --count", "1\n", nil).
+				Expect("git rev-list HEAD..@{u} --count", "2\n", nil),
 			"1", "2",
 		},
 	}
 
 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
-			instance := buildBranchCommands(commonDeps{runner: s.runner})
+			instance := NewBranchCommandsWithRunner(s.runner)
 			pushables, pullables := instance.GetCommitDifferences("HEAD", "@{u}")
 			assert.EqualValues(t, s.expectedPushables, pushables)
 			assert.EqualValues(t, s.expectedPullables, pullables)
@@ -53,10 +59,10 @@ func TestBranchGetCommitDifferences(t *testing.T) {
 
 func TestBranchNewBranch(t *testing.T) {
 	runner := oscommands.NewFakeRunner(t).
-		ExpectGitArgs([]string{"checkout", "-b", "test", "refs/heads/master"}, "", nil)
-	instance := buildBranchCommands(commonDeps{runner: runner})
+		Expect(`git checkout -b "test" "master"`, "", nil)
+	instance := NewBranchCommandsWithRunner(runner)
 
-	assert.NoError(t, instance.New("test", "refs/heads/master"))
+	assert.NoError(t, instance.New("test", "master"))
 	runner.CheckForMissingCalls()
 }
 
@@ -72,7 +78,7 @@ func TestBranchDeleteBranch(t *testing.T) {
 		{
 			"Delete a branch",
 			false,
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"branch", "-d", "test"}, "", nil),
+			oscommands.NewFakeRunner(t).Expect(`git branch -d "test"`, "", nil),
 			func(err error) {
 				assert.NoError(t, err)
 			},
@@ -80,7 +86,7 @@ func TestBranchDeleteBranch(t *testing.T) {
 		{
 			"Force delete a branch",
 			true,
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"branch", "-D", "test"}, "", nil),
+			oscommands.NewFakeRunner(t).Expect(`git branch -D "test"`, "", nil),
 			func(err error) {
 				assert.NoError(t, err)
 			},
@@ -88,75 +94,23 @@ func TestBranchDeleteBranch(t *testing.T) {
 	}
 
 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
-			instance := buildBranchCommands(commonDeps{runner: s.runner})
+			instance := NewBranchCommandsWithRunner(s.runner)
 
-			s.test(instance.LocalDelete("test", s.force))
+			s.test(instance.Delete("test", s.force))
 			s.runner.CheckForMissingCalls()
 		})
 	}
 }
 
 func TestBranchMerge(t *testing.T) {
-	scenarios := []struct {
-		testName   string
-		userConfig *config.UserConfig
-		opts       MergeOpts
-		branchName string
-		expected   []string
-	}{
-		{
-			testName:   "basic",
-			userConfig: &config.UserConfig{},
-			opts:       MergeOpts{},
-			branchName: "mybranch",
-			expected:   []string{"merge", "--no-edit", "mybranch"},
-		},
-		{
-			testName: "merging args",
-			userConfig: &config.UserConfig{
-				Git: config.GitConfig{
-					Merging: config.MergingConfig{
-						Args: "--merging-args", // it's up to the user what they put here
-					},
-				},
-			},
-			opts:       MergeOpts{},
-			branchName: "mybranch",
-			expected:   []string{"merge", "--no-edit", "--merging-args", "mybranch"},
-		},
-		{
-			testName: "multiple merging args",
-			userConfig: &config.UserConfig{
-				Git: config.GitConfig{
-					Merging: config.MergingConfig{
-						Args: "--arg1 --arg2", // it's up to the user what they put here
-					},
-				},
-			},
-			opts:       MergeOpts{},
-			branchName: "mybranch",
-			expected:   []string{"merge", "--no-edit", "--arg1", "--arg2", "mybranch"},
-		},
-		{
-			testName:   "fast forward only",
-			userConfig: &config.UserConfig{},
-			opts:       MergeOpts{FastForwardOnly: true},
-			branchName: "mybranch",
-			expected:   []string{"merge", "--no-edit", "--ff-only", "mybranch"},
-		},
-	}
+	runner := oscommands.NewFakeRunner(t).
+		Expect(`git merge --no-edit "test"`, "", nil)
+	instance := NewBranchCommandsWithRunner(runner)
 
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			runner := oscommands.NewFakeRunner(t).
-				ExpectGitArgs(s.expected, "", nil)
-			instance := buildBranchCommands(commonDeps{runner: runner, userConfig: s.userConfig})
-
-			assert.NoError(t, instance.Merge(s.branchName, s.opts))
-			runner.CheckForMissingCalls()
-		})
-	}
+	assert.NoError(t, instance.Merge("test", MergeOpts{}))
+	runner.CheckForMissingCalls()
 }
 
 func TestBranchCheckout(t *testing.T) {
@@ -170,7 +124,7 @@ func TestBranchCheckout(t *testing.T) {
 	scenarios := []scenario{
 		{
 			"Checkout",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"checkout", "test"}, "", nil),
+			oscommands.NewFakeRunner(t).Expect(`git checkout "test"`, "", nil),
 			func(err error) {
 				assert.NoError(t, err)
 			},
@@ -178,7 +132,7 @@ func TestBranchCheckout(t *testing.T) {
 		},
 		{
 			"Checkout forced",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"checkout", "--force", "test"}, "", nil),
+			oscommands.NewFakeRunner(t).Expect(`git checkout --force "test"`, "", nil),
 			func(err error) {
 				assert.NoError(t, err)
 			},
@@ -187,8 +141,9 @@ func TestBranchCheckout(t *testing.T) {
 	}
 
 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
-			instance := buildBranchCommands(commonDeps{runner: s.runner})
+			instance := NewBranchCommandsWithRunner(s.runner)
 			s.test(instance.Checkout("test", CheckoutOptions{Force: s.force}))
 			s.runner.CheckForMissingCalls()
 		})
@@ -199,7 +154,7 @@ func TestBranchGetBranchGraph(t *testing.T) {
 	runner := oscommands.NewFakeRunner(t).ExpectGitArgs([]string{
 		"log", "--graph", "--color=always", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium", "test", "--",
 	}, "", nil)
-	instance := buildBranchCommands(commonDeps{runner: runner})
+	instance := NewBranchCommandsWithRunner(runner)
 	_, err := instance.GetGraph("test")
 	assert.NoError(t, err)
 }
@@ -208,76 +163,68 @@ func TestBranchGetAllBranchGraph(t *testing.T) {
 	runner := oscommands.NewFakeRunner(t).ExpectGitArgs([]string{
 		"log", "--graph", "--all", "--color=always", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium",
 	}, "", nil)
-	instance := buildBranchCommands(commonDeps{runner: runner})
+	instance := NewBranchCommandsWithRunner(runner)
 	err := instance.AllBranchesLogCmdObj().Run()
 	assert.NoError(t, err)
 }
 
-func TestBranchCurrentBranchInfo(t *testing.T) {
+func TestBranchCurrentBranchName(t *testing.T) {
 	type scenario struct {
 		testName string
 		runner   *oscommands.FakeCmdObjRunner
-		test     func(BranchInfo, error)
+		test     func(string, string, error)
 	}
 
 	scenarios := []scenario{
 		{
 			"says we are on the master branch if we are",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"symbolic-ref", "--short", "HEAD"}, "master", nil),
-			func(info BranchInfo, err error) {
+			oscommands.NewFakeRunner(t).Expect(`git symbolic-ref --short HEAD`, "master", nil),
+			func(name string, displayname string, err error) {
 				assert.NoError(t, err)
-				assert.EqualValues(t, "master", info.RefName)
-				assert.EqualValues(t, "master", info.DisplayName)
-				assert.False(t, info.DetachedHead)
+				assert.EqualValues(t, "master", name)
+				assert.EqualValues(t, "master", displayname)
 			},
 		},
 		{
-			"falls back to git `git branch --points-at=HEAD` if symbolic-ref fails",
+			"falls back to git `git branch --contains` if symbolic-ref fails",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"symbolic-ref", "--short", "HEAD"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"branch", "--points-at=HEAD", "--format=%(HEAD)%00%(objectname)%00%(refname)"},
-					"*\x006f71c57a8d4bd6c11399c3f55f42c815527a73a4\x00(HEAD detached at 6f71c57a)\n", nil),
-			func(info BranchInfo, err error) {
+				Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
+				Expect(`git branch --contains`, "* master", nil),
+			func(name string, displayname string, err error) {
 				assert.NoError(t, err)
-				assert.EqualValues(t, "6f71c57a8d4bd6c11399c3f55f42c815527a73a4", info.RefName)
-				assert.EqualValues(t, "(HEAD detached at 6f71c57a)", info.DisplayName)
-				assert.True(t, info.DetachedHead)
+				assert.EqualValues(t, "master", name)
+				assert.EqualValues(t, "master", displayname)
 			},
 		},
 		{
-			"handles a detached head (LANG=zh_CN.UTF-8)",
+			"handles a detached head",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"symbolic-ref", "--short", "HEAD"}, "", errors.New("error")).
-				ExpectGitArgs(
-					[]string{"branch", "--points-at=HEAD", "--format=%(HEAD)%00%(objectname)%00%(refname)"},
-					"*\x00679b0456f3db7c505b398def84e7d023e5b55a8d\x00（头指针在 679b0456 分离）\n"+
-						" \x00679b0456f3db7c505b398def84e7d023e5b55a8d\x00refs/heads/master\n",
-					nil),
-			func(info BranchInfo, err error) {
+				Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
+				Expect(`git branch --contains`, "* (HEAD detached at 123abcd)", nil),
+			func(name string, displayname string, err error) {
 				assert.NoError(t, err)
-				assert.EqualValues(t, "679b0456f3db7c505b398def84e7d023e5b55a8d", info.RefName)
-				assert.EqualValues(t, "（头指针在 679b0456 分离）", info.DisplayName)
-				assert.True(t, info.DetachedHead)
+				assert.EqualValues(t, "123abcd", name)
+				assert.EqualValues(t, "(HEAD detached at 123abcd)", displayname)
 			},
 		},
 		{
 			"bubbles up error if there is one",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"symbolic-ref", "--short", "HEAD"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"branch", "--points-at=HEAD", "--format=%(HEAD)%00%(objectname)%00%(refname)"}, "", errors.New("error")),
-			func(info BranchInfo, err error) {
+				Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
+				Expect(`git branch --contains`, "", errors.New("error")),
+			func(name string, displayname string, err error) {
 				assert.Error(t, err)
-				assert.EqualValues(t, "", info.RefName)
-				assert.EqualValues(t, "", info.DisplayName)
-				assert.False(t, info.DetachedHead)
+				assert.EqualValues(t, "", name)
+				assert.EqualValues(t, "", displayname)
 			},
 		},
 	}
 
 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
-			instance := buildBranchCommands(commonDeps{runner: s.runner})
-			s.test(instance.CurrentBranchInfo())
+			instance := NewBranchCommandsWithRunner(s.runner)
+			s.test(instance.CurrentBranchName())
 			s.runner.CheckForMissingCalls()
 		})
 	}

pkg/commands/git_commands/commit.go

@@ -4,80 +4,34 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
 )
 
-var ErrInvalidCommitIndex = errors.New("invalid commit index")
-
 type CommitCommands struct {
-	*GitCommon
+	*common.Common
+
+	cmd oscommands.ICmdObjBuilder
 }
 
-func NewCommitCommands(gitCommon *GitCommon) *CommitCommands {
+func NewCommitCommands(
+	common *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+) *CommitCommands {
 	return &CommitCommands{
-		GitCommon: gitCommon,
+		Common: common,
+		cmd:    cmd,
 	}
 }
 
-// ResetAuthor resets the author of the topmost commit
-func (self *CommitCommands) ResetAuthor() error {
-	cmdArgs := NewGitCmd("commit").
-		Arg("--allow-empty", "--only", "--no-edit", "--amend", "--reset-author").
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-// Sets the commit's author to the supplied value. Value is expected to be of the form 'Name <Email>'
-func (self *CommitCommands) SetAuthor(value string) error {
-	cmdArgs := NewGitCmd("commit").
-		Arg("--allow-empty", "--only", "--no-edit", "--amend", "--author="+value).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-// Add a commit's coauthor using Github/Gitlab Co-authored-by metadata. Value is expected to be of the form 'Name <Email>'
-func (self *CommitCommands) AddCoAuthor(hash string, author string) error {
-	message, err := self.GetCommitMessage(hash)
-	if err != nil {
-		return err
-	}
-
-	message = AddCoAuthorToMessage(message, author)
-
-	cmdArgs := NewGitCmd("commit").
-		Arg("--allow-empty", "--amend", "--only", "-m", message).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-func AddCoAuthorToMessage(message string, author string) string {
-	subject, body, _ := strings.Cut(message, "\n")
-
-	return strings.TrimSpace(subject) + "\n\n" + AddCoAuthorToDescription(strings.TrimSpace(body), author)
-}
-
-func AddCoAuthorToDescription(description string, author string) string {
-	if description != "" {
-		lines := strings.Split(description, "\n")
-		if strings.HasPrefix(lines[len(lines)-1], "Co-authored-by:") {
-			description += "\n"
-		} else {
-			description += "\n\n"
-		}
-	}
-
-	return description + fmt.Sprintf("Co-authored-by: %s", author)
+// RewordLastCommit rewords the topmost commit with the given message
+func (self *CommitCommands) RewordLastCommit(message string) error {
+	return self.cmd.New("git commit --allow-empty --amend --only -m " + self.cmd.Quote(message)).Run()
 }
 
 // ResetToCommit reset to commit
-func (self *CommitCommands) ResetToCommit(hash string, strength string, envVars []string) error {
-	cmdArgs := NewGitCmd("reset").Arg("--"+strength, hash).ToArgv()
-
-	return self.cmd.New(cmdArgs).
+func (self *CommitCommands) ResetToCommit(sha string, strength string, envVars []string) error {
+	return self.cmd.New(fmt.Sprintf("git reset --%s %s", strength, sha)).
 		// prevents git from prompting us for input which would freeze the program
 		// TODO: see if this is actually needed here
 		AddEnvVars("GIT_TERMINAL_PROMPT=0").
@@ -85,161 +39,50 @@ func (self *CommitCommands) ResetToCommit(hash string, strength string, envVars
 		Run()
 }
 
-func (self *CommitCommands) CommitCmdObj(summary string, description string) oscommands.ICmdObj {
-	messageArgs := self.commitMessageArgs(summary, description)
-
-	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
-
-	cmdArgs := NewGitCmd("commit").
-		ArgIf(skipHookPrefix != "" && strings.HasPrefix(summary, skipHookPrefix), "--no-verify").
-		ArgIf(self.signoffFlag() != "", self.signoffFlag()).
-		Arg(messageArgs...).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs)
-}
-
-func (self *CommitCommands) RewordLastCommitInEditorCmdObj() oscommands.ICmdObj {
-	return self.cmd.New(NewGitCmd("commit").Arg("--allow-empty", "--amend", "--only").ToArgv())
-}
-
-func (self *CommitCommands) RewordLastCommitInEditorWithMessageFileCmdObj(tmpMessageFile string) oscommands.ICmdObj {
-	return self.cmd.New(NewGitCmd("commit").
-		Arg("--allow-empty", "--amend", "--only", "--edit", "--file="+tmpMessageFile).ToArgv())
-}
-
-func (self *CommitCommands) CommitInEditorWithMessageFileCmdObj(tmpMessageFile string) oscommands.ICmdObj {
-	return self.cmd.New(NewGitCmd("commit").
-		Arg("--edit").
-		Arg("--file="+tmpMessageFile).
-		ArgIf(self.signoffFlag() != "", self.signoffFlag()).
-		ToArgv())
-}
-
-// RewordLastCommit rewords the topmost commit with the given message
-func (self *CommitCommands) RewordLastCommit(summary string, description string) error {
-	messageArgs := self.commitMessageArgs(summary, description)
-
-	cmdArgs := NewGitCmd("commit").
-		Arg("--allow-empty", "--amend", "--only").
-		Arg(messageArgs...).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-func (self *CommitCommands) commitMessageArgs(summary string, description string) []string {
-	args := []string{"-m", summary}
-
-	if description != "" {
-		args = append(args, "-m", description)
+func (self *CommitCommands) CommitCmdObj(message string) oscommands.ICmdObj {
+	splitMessage := strings.Split(message, "\n")
+	lineArgs := ""
+	for _, line := range splitMessage {
+		lineArgs += fmt.Sprintf(" -m %s", self.cmd.Quote(line))
 	}
 
-	return args
+	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
+	noVerifyFlag := ""
+	if skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix) {
+		noVerifyFlag = " --no-verify"
+	}
+
+	return self.cmd.New(fmt.Sprintf("git commit%s%s%s", noVerifyFlag, self.signoffFlag(), lineArgs))
 }
 
 // runs git commit without the -m argument meaning it will invoke the user's editor
 func (self *CommitCommands) CommitEditorCmdObj() oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("commit").
-		ArgIf(self.signoffFlag() != "", self.signoffFlag()).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New(fmt.Sprintf("git commit%s", self.signoffFlag()))
 }
 
 func (self *CommitCommands) signoffFlag() string {
 	if self.UserConfig.Git.Commit.SignOff {
-		return "--signoff"
+		return " --signoff"
 	} else {
 		return ""
 	}
 }
 
-func (self *CommitCommands) GetCommitMessage(commitHash string) (string, error) {
-	cmdArgs := NewGitCmd("log").
-		Arg("--format=%B", "--max-count=1", commitHash).
-		Config("log.showsignature=false").
-		ToArgv()
-
-	message, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	return strings.ReplaceAll(strings.TrimSpace(message), "\r\n", "\n"), err
+// Get the subject of the HEAD commit
+func (self *CommitCommands) GetHeadCommitMessage() (string, error) {
+	message, err := self.cmd.New("git log -1 --pretty=%s").DontLog().RunWithOutput()
+	return strings.TrimSpace(message), err
 }
 
-func (self *CommitCommands) GetCommitSubject(commitHash string) (string, error) {
-	cmdArgs := NewGitCmd("log").
-		Arg("--format=%s", "--max-count=1", commitHash).
-		Config("log.showsignature=false").
-		ToArgv()
-
-	subject, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	return strings.TrimSpace(subject), err
+func (self *CommitCommands) GetCommitMessage(commitSha string) (string, error) {
+	cmdStr := "git rev-list --format=%B --max-count=1 " + commitSha
+	messageWithHeader, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
+	message := strings.Join(strings.SplitAfter(messageWithHeader, "\n")[1:], "\n")
+	return strings.TrimSpace(message), err
 }
 
-func (self *CommitCommands) GetCommitDiff(commitHash string) (string, error) {
-	cmdArgs := NewGitCmd("show").Arg("--no-color", commitHash).ToArgv()
-
-	diff, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	return diff, err
-}
-
-type Author struct {
-	Name  string
-	Email string
-}
-
-func (self *CommitCommands) GetCommitAuthor(commitHash string) (Author, error) {
-	cmdArgs := NewGitCmd("show").
-		Arg("--no-patch", "--pretty=format:'%an%x00%ae'", commitHash).
-		ToArgv()
-
-	output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	if err != nil {
-		return Author{}, err
-	}
-
-	split := strings.SplitN(strings.TrimSpace(output), "\x00", 2)
-	if len(split) < 2 {
-		return Author{}, errors.New("unexpected git output")
-	}
-
-	author := Author{Name: split[0], Email: split[1]}
-	return author, err
-}
-
-func (self *CommitCommands) GetCommitMessageFirstLine(hash string) (string, error) {
-	return self.GetCommitMessagesFirstLine([]string{hash})
-}
-
-func (self *CommitCommands) GetCommitMessagesFirstLine(hashes []string) (string, error) {
-	cmdArgs := NewGitCmd("show").
-		Arg("--no-patch", "--pretty=format:%s").
-		Arg(hashes...).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-}
-
-// Example output:
-//
-//	cd50c79ae Preserve the commit message correctly even if the description has blank lines
-//	3ebba5f32 Add test demonstrating a bug with preserving the commit message
-//	9a423c388 Remove unused function
-func (self *CommitCommands) GetHashesAndCommitMessagesFirstLine(hashes []string) (string, error) {
-	cmdArgs := NewGitCmd("show").
-		Arg("--no-patch", "--pretty=format:%h %s").
-		Arg(hashes...).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-}
-
-func (self *CommitCommands) GetCommitsOneline(hashes []string) (string, error) {
-	cmdArgs := NewGitCmd("show").
-		Arg("--no-patch", "--oneline").
-		Arg(hashes...).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+func (self *CommitCommands) GetCommitMessageFirstLine(sha string) (string, error) {
+	return self.cmd.New(fmt.Sprintf("git show --no-patch --pretty=format:%%s %s", sha)).DontLog().RunWithOutput()
 }
 
 // AmendHead amends HEAD with whatever is staged in your working tree
@@ -248,81 +91,30 @@ func (self *CommitCommands) AmendHead() error {
 }
 
 func (self *CommitCommands) AmendHeadCmdObj() oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("commit").
-		Arg("--amend", "--no-edit", "--allow-empty").
-		ToArgv()
-
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New("git commit --amend --no-edit --allow-empty")
 }
 
-func (self *CommitCommands) ShowCmdObj(hash string, filterPath string) oscommands.ICmdObj {
-	contextSize := self.AppState.DiffContextSize
+func (self *CommitCommands) ShowCmdObj(sha string, filterPath string) oscommands.ICmdObj {
+	contextSize := self.UserConfig.Git.DiffContextSize
+	filterPathArg := ""
+	if filterPath != "" {
+		filterPathArg = fmt.Sprintf(" -- %s", self.cmd.Quote(filterPath))
+	}
 
-	extDiffCmd := self.UserConfig.Git.Paging.ExternalDiffCommand
-	cmdArgs := NewGitCmd("show").
-		Config("diff.noprefix=false").
-		ConfigIf(extDiffCmd != "", "diff.external="+extDiffCmd).
-		ArgIfElse(extDiffCmd != "", "--ext-diff", "--no-ext-diff").
-		Arg("--submodule").
-		Arg("--color="+self.UserConfig.Git.Paging.ColorArg).
-		Arg(fmt.Sprintf("--unified=%d", contextSize)).
-		Arg("--stat").
-		Arg("--decorate").
-		Arg("-p").
-		Arg(hash).
-		ArgIf(self.AppState.IgnoreWhitespaceInDiffView, "--ignore-all-space").
-		ArgIf(filterPath != "", "--", filterPath).
-		Dir(self.repoPaths.worktreePath).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).DontLog()
+	cmdStr := fmt.Sprintf("git show --submodule --color=%s --unified=%d --no-renames --stat -p %s %s", self.UserConfig.Git.Paging.ColorArg, contextSize, sha, filterPathArg)
+	return self.cmd.New(cmdStr).DontLog()
 }
 
-// Revert reverts the selected commit by hash
-func (self *CommitCommands) Revert(hash string) error {
-	cmdArgs := NewGitCmd("revert").Arg(hash).ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
+// Revert reverts the selected commit by sha
+func (self *CommitCommands) Revert(sha string) error {
+	return self.cmd.New(fmt.Sprintf("git revert %s", sha)).Run()
 }
 
-func (self *CommitCommands) RevertMerge(hash string, parentNumber int) error {
-	cmdArgs := NewGitCmd("revert").Arg(hash, "-m", fmt.Sprintf("%d", parentNumber)).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
+func (self *CommitCommands) RevertMerge(sha string, parentNumber int) error {
+	return self.cmd.New(fmt.Sprintf("git revert %s -m %d", sha, parentNumber)).Run()
 }
 
 // CreateFixupCommit creates a commit that fixes up a previous commit
-func (self *CommitCommands) CreateFixupCommit(hash string) error {
-	cmdArgs := NewGitCmd("commit").Arg("--fixup=" + hash).ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-// CreateAmendCommit creates a commit that changes the commit message of a previous commit
-func (self *CommitCommands) CreateAmendCommit(originalSubject, newSubject, newDescription string, includeFileChanges bool) error {
-	description := newSubject
-	if newDescription != "" {
-		description += "\n\n" + newDescription
-	}
-	cmdArgs := NewGitCmd("commit").
-		Arg("-m", "amend! "+originalSubject).
-		Arg("-m", description).
-		ArgIf(!includeFileChanges, "--only", "--allow-empty").
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-// a value of 0 means the head commit, 1 is the parent commit, etc
-func (self *CommitCommands) GetCommitMessageFromHistory(value int) (string, error) {
-	cmdArgs := NewGitCmd("log").Arg("-1", fmt.Sprintf("--skip=%d", value), "--pretty=%H").
-		ToArgv()
-
-	hash, _ := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	formattedHash := strings.TrimSpace(hash)
-	if len(formattedHash) == 0 {
-		return "", ErrInvalidCommitIndex
-	}
-	return self.GetCommitMessage(formattedHash)
+func (self *CommitCommands) CreateFixupCommit(sha string) error {
+	return self.cmd.New(fmt.Sprintf("git commit --fixup=%s", sha)).Run()
 }

pkg/commands/git_commands/commit_file_loader.go

@@ -1,61 +0,0 @@
-package git_commands
-
-import (
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/common"
-	"github.com/samber/lo"
-)
-
-type CommitFileLoader struct {
-	*common.Common
-	cmd oscommands.ICmdObjBuilder
-}
-
-func NewCommitFileLoader(common *common.Common, cmd oscommands.ICmdObjBuilder) *CommitFileLoader {
-	return &CommitFileLoader{
-		Common: common,
-		cmd:    cmd,
-	}
-}
-
-// GetFilesInDiff get the specified commit files
-func (self *CommitFileLoader) GetFilesInDiff(from string, to string, reverse bool) ([]*models.CommitFile, error) {
-	cmdArgs := NewGitCmd("diff").
-		Config("diff.noprefix=false").
-		Arg("--submodule").
-		Arg("--no-ext-diff").
-		Arg("--name-status").
-		Arg("-z").
-		Arg("--no-renames").
-		ArgIf(reverse, "-R").
-		Arg(from).
-		Arg(to).
-		ToArgv()
-
-	filenames, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	if err != nil {
-		return nil, err
-	}
-
-	return getCommitFilesFromFilenames(filenames), nil
-}
-
-// filenames string is something like "MM\x00file1\x00MU\x00file2\x00AA\x00file3\x00"
-// so we need to split it by the null character and then map each status-name pair to a commit file
-func getCommitFilesFromFilenames(filenames string) []*models.CommitFile {
-	lines := strings.Split(strings.TrimRight(filenames, "\x00"), "\x00")
-	if len(lines) == 1 {
-		return []*models.CommitFile{}
-	}
-
-	// typical result looks like 'A my_file' meaning my_file was added
-	return lo.Map(lo.Chunk(lines, 2), func(chunk []string, _ int) *models.CommitFile {
-		return &models.CommitFile{
-			ChangeStatus: chunk[0],
-			Name:         chunk[1],
-		}
-	})
-}

pkg/commands/git_commands/commit_file_loader_test.go

@@ -1,71 +0,0 @@
-package git_commands
-
-import (
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGetCommitFilesFromFilenames(t *testing.T) {
-	tests := []struct {
-		testName string
-		input    string
-		output   []*models.CommitFile
-	}{
-		{
-			testName: "no files",
-			input:    "",
-			output:   []*models.CommitFile{},
-		},
-		{
-			testName: "one file",
-			input:    "MM\x00Myfile\x00",
-			output: []*models.CommitFile{
-				{
-					Name:         "Myfile",
-					ChangeStatus: "MM",
-				},
-			},
-		},
-		{
-			testName: "two files",
-			input:    "MM\x00Myfile\x00M \x00MyOtherFile\x00",
-			output: []*models.CommitFile{
-				{
-					Name:         "Myfile",
-					ChangeStatus: "MM",
-				},
-				{
-					Name:         "MyOtherFile",
-					ChangeStatus: "M ",
-				},
-			},
-		},
-		{
-			testName: "three files",
-			input:    "MM\x00Myfile\x00M \x00MyOtherFile\x00 M\x00YetAnother\x00",
-			output: []*models.CommitFile{
-				{
-					Name:         "Myfile",
-					ChangeStatus: "MM",
-				},
-				{
-					Name:         "MyOtherFile",
-					ChangeStatus: "M ",
-				},
-				{
-					Name:         "YetAnother",
-					ChangeStatus: " M",
-				},
-			},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.testName, func(t *testing.T) {
-			result := getCommitFilesFromFilenames(test.input)
-			assert.Equal(t, test.output, result)
-		})
-	}
-}

pkg/commands/git_commands/commit_loader.go

@@ -1,527 +0,0 @@
-package git_commands
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
-	"github.com/jesseduffield/lazygit/pkg/common"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
-	"github.com/stefanhaller/git-todo-parser/todo"
-)
-
-// context:
-// here we get the commits from git log but format them to show whether they're
-// unpushed/pushed/merged into the base branch or not, or if they're yet to
-// be processed as part of a rebase (these won't appear in git log but we
-// grab them from the rebase-related files in the .git directory to show them
-
-// CommitLoader returns a list of Commit objects for the current repo
-type CommitLoader struct {
-	*common.Common
-	cmd oscommands.ICmdObjBuilder
-
-	getRebaseMode func() (enums.RebaseMode, error)
-	readFile      func(filename string) ([]byte, error)
-	walkFiles     func(root string, fn filepath.WalkFunc) error
-	dotGitDir     string
-	*GitCommon
-}
-
-// making our dependencies explicit for the sake of easier testing
-func NewCommitLoader(
-	cmn *common.Common,
-	cmd oscommands.ICmdObjBuilder,
-	getRebaseMode func() (enums.RebaseMode, error),
-	gitCommon *GitCommon,
-) *CommitLoader {
-	return &CommitLoader{
-		Common:        cmn,
-		cmd:           cmd,
-		getRebaseMode: getRebaseMode,
-		readFile:      os.ReadFile,
-		walkFiles:     filepath.Walk,
-		GitCommon:     gitCommon,
-	}
-}
-
-type GetCommitsOptions struct {
-	Limit                bool
-	FilterPath           string
-	FilterAuthor         string
-	IncludeRebaseCommits bool
-	RefName              string // e.g. "HEAD" or "my_branch"
-	RefForPushedStatus   string // the ref to use for determining pushed/unpushed status
-	// determines if we show the whole git graph i.e. pass the '--all' flag
-	All bool
-	// If non-empty, show divergence from this ref (left-right log)
-	RefToShowDivergenceFrom string
-	MainBranches            *MainBranches
-}
-
-// GetCommits obtains the commits of the current branch
-func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit, error) {
-	commits := []*models.Commit{}
-	var rebasingCommits []*models.Commit
-
-	if opts.IncludeRebaseCommits && opts.FilterPath == "" {
-		var err error
-		rebasingCommits, err = self.MergeRebasingCommits(commits)
-		if err != nil {
-			return nil, err
-		}
-		commits = append(commits, rebasingCommits...)
-	}
-
-	wg := sync.WaitGroup{}
-
-	wg.Add(2)
-
-	var logErr error
-	go utils.Safe(func() {
-		defer wg.Done()
-
-		logErr = self.getLogCmd(opts).RunAndProcessLines(func(line string) (bool, error) {
-			commit := self.extractCommitFromLine(line, opts.RefToShowDivergenceFrom != "")
-			commits = append(commits, commit)
-			return false, nil
-		})
-	})
-
-	var ancestor string
-	var remoteAncestor string
-	go utils.Safe(func() {
-		defer wg.Done()
-
-		ancestor = opts.MainBranches.GetMergeBase(opts.RefName)
-		if opts.RefToShowDivergenceFrom != "" {
-			remoteAncestor = opts.MainBranches.GetMergeBase(opts.RefToShowDivergenceFrom)
-		}
-	})
-
-	passedFirstPushedCommit := false
-	// I can get this before
-	firstPushedCommit, err := self.getFirstPushedCommit(opts.RefForPushedStatus)
-	if err != nil {
-		// must have no upstream branch so we'll consider everything as pushed
-		passedFirstPushedCommit = true
-	}
-
-	wg.Wait()
-
-	if logErr != nil {
-		return nil, logErr
-	}
-
-	for _, commit := range commits {
-		if commit.Hash == firstPushedCommit {
-			passedFirstPushedCommit = true
-		}
-		if commit.Status != models.StatusRebasing {
-			if passedFirstPushedCommit {
-				commit.Status = models.StatusPushed
-			} else {
-				commit.Status = models.StatusUnpushed
-			}
-		}
-	}
-
-	if len(commits) == 0 {
-		return commits, nil
-	}
-
-	if opts.RefToShowDivergenceFrom != "" {
-		sort.SliceStable(commits, func(i, j int) bool {
-			// In the divergence view we want incoming commits to come first
-			return commits[i].Divergence > commits[j].Divergence
-		})
-
-		_, localSectionStart, found := lo.FindIndexOf(commits, func(commit *models.Commit) bool {
-			return commit.Divergence == models.DivergenceLeft
-		})
-		if !found {
-			localSectionStart = len(commits)
-		}
-
-		setCommitMergedStatuses(remoteAncestor, commits[:localSectionStart])
-		setCommitMergedStatuses(ancestor, commits[localSectionStart:])
-	} else {
-		setCommitMergedStatuses(ancestor, commits)
-	}
-
-	return commits, nil
-}
-
-func (self *CommitLoader) MergeRebasingCommits(commits []*models.Commit) ([]*models.Commit, error) {
-	// chances are we have as many commits as last time so we'll set the capacity to be the old length
-	result := make([]*models.Commit, 0, len(commits))
-	for i, commit := range commits {
-		if !commit.IsTODO() { // removing the existing rebase commits so we can add the refreshed ones
-			result = append(result, commits[i:]...)
-			break
-		}
-	}
-
-	rebaseMode, err := self.getRebaseMode()
-	if err != nil {
-		return nil, err
-	}
-
-	if rebaseMode == enums.REBASE_MODE_NONE {
-		// not in rebase mode so return original commits
-		return result, nil
-	}
-
-	rebasingCommits, err := self.getHydratedRebasingCommits(rebaseMode)
-	if err != nil {
-		return nil, err
-	}
-	if len(rebasingCommits) > 0 {
-		result = append(rebasingCommits, result...)
-	}
-
-	return result, nil
-}
-
-// extractCommitFromLine takes a line from a git log and extracts the hash, message, date, and tag if present
-// then puts them into a commit object
-// example input:
-// 8ad01fe32fcc20f07bc6693f87aa4977c327f1e1|10 hours ago|Jesse Duffield| (HEAD -> master, tag: v0.15.2)|refresh commits when adding a tag
-func (self *CommitLoader) extractCommitFromLine(line string, showDivergence bool) *models.Commit {
-	split := strings.SplitN(line, "\x00", 8)
-
-	hash := split[0]
-	unixTimestamp := split[1]
-	authorName := split[2]
-	authorEmail := split[3]
-	extraInfo := strings.TrimSpace(split[4])
-	parentHashes := split[5]
-	divergence := models.DivergenceNone
-	if showDivergence {
-		divergence = lo.Ternary(split[6] == "<", models.DivergenceLeft, models.DivergenceRight)
-	}
-	message := split[7]
-
-	tags := []string{}
-
-	if extraInfo != "" {
-		extraInfoFields := strings.Split(extraInfo, ",")
-		for _, extraInfoField := range extraInfoFields {
-			extraInfoField = strings.TrimSpace(extraInfoField)
-			re := regexp.MustCompile(`tag: (.+)`)
-			tagMatch := re.FindStringSubmatch(extraInfoField)
-			if len(tagMatch) > 1 {
-				tags = append(tags, tagMatch[1])
-			}
-		}
-
-		extraInfo = "(" + extraInfo + ")"
-	}
-
-	unitTimestampInt, _ := strconv.Atoi(unixTimestamp)
-
-	parents := []string{}
-	if len(parentHashes) > 0 {
-		parents = strings.Split(parentHashes, " ")
-	}
-
-	return &models.Commit{
-		Hash:          hash,
-		Name:          message,
-		Tags:          tags,
-		ExtraInfo:     extraInfo,
-		UnixTimestamp: int64(unitTimestampInt),
-		AuthorName:    authorName,
-		AuthorEmail:   authorEmail,
-		Parents:       parents,
-		Divergence:    divergence,
-	}
-}
-
-func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode) ([]*models.Commit, error) {
-	commits := self.getRebasingCommits(rebaseMode)
-
-	if len(commits) == 0 {
-		return nil, nil
-	}
-
-	commitHashes := lo.FilterMap(commits, func(commit *models.Commit, _ int) (string, bool) {
-		return commit.Hash, commit.Hash != ""
-	})
-
-	// note that we're not filtering these as we do non-rebasing commits just because
-	// I suspect that will cause some damage
-	cmdObj := self.cmd.New(
-		NewGitCmd("show").
-			Config("log.showSignature=false").
-			Arg("--no-patch", "--oneline", "--abbrev=20", prettyFormat).
-			Arg(commitHashes...).
-			ToArgv(),
-	).DontLog()
-
-	fullCommits := map[string]*models.Commit{}
-	err := cmdObj.RunAndProcessLines(func(line string) (bool, error) {
-		commit := self.extractCommitFromLine(line, false)
-		fullCommits[commit.Hash] = commit
-		return false, nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	findFullCommit := lo.Ternary(self.version.IsOlderThan(2, 25, 2),
-		func(hash string) *models.Commit {
-			for s, c := range fullCommits {
-				if strings.HasPrefix(s, hash) {
-					return c
-				}
-			}
-			return nil
-		},
-		func(hash string) *models.Commit {
-			return fullCommits[hash]
-		})
-
-	hydratedCommits := make([]*models.Commit, 0, len(commits))
-	for _, rebasingCommit := range commits {
-		if rebasingCommit.Hash == "" {
-			hydratedCommits = append(hydratedCommits, rebasingCommit)
-		} else if commit := findFullCommit(rebasingCommit.Hash); commit != nil {
-			commit.Action = rebasingCommit.Action
-			commit.Status = rebasingCommit.Status
-			hydratedCommits = append(hydratedCommits, commit)
-		}
-	}
-	return hydratedCommits, nil
-}
-
-// getRebasingCommits obtains the commits that we're in the process of rebasing
-
-// git-rebase-todo example:
-// pick ac446ae94ee560bdb8d1d057278657b251aaef17 ac446ae
-// pick afb893148791a2fbd8091aeb81deba4930c73031 afb8931
-func (self *CommitLoader) getRebasingCommits(rebaseMode enums.RebaseMode) []*models.Commit {
-	if rebaseMode != enums.REBASE_MODE_INTERACTIVE {
-		return nil
-	}
-
-	bytesContent, err := self.readFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo"))
-	if err != nil {
-		self.Log.Error(fmt.Sprintf("error occurred reading git-rebase-todo: %s", err.Error()))
-		// we assume an error means the file doesn't exist so we just return
-		return nil
-	}
-
-	commits := []*models.Commit{}
-
-	todos, err := todo.Parse(bytes.NewBuffer(bytesContent), self.config.GetCoreCommentChar())
-	if err != nil {
-		self.Log.Error(fmt.Sprintf("error occurred while parsing git-rebase-todo file: %s", err.Error()))
-		return nil
-	}
-
-	// See if the current commit couldn't be applied because it conflicted; if
-	// so, add a fake entry for it
-	if conflictedCommitHash := self.getConflictedCommit(todos); conflictedCommitHash != "" {
-		commits = append(commits, &models.Commit{
-			Hash:   conflictedCommitHash,
-			Name:   "",
-			Status: models.StatusRebasing,
-			Action: models.ActionConflict,
-		})
-	}
-
-	for _, t := range todos {
-		if t.Command == todo.UpdateRef {
-			t.Msg = t.Ref
-		} else if t.Command == todo.Exec {
-			t.Msg = t.ExecCommand
-		} else if t.Commit == "" {
-			// Command does not have a commit associated, skip
-			continue
-		}
-		commits = utils.Prepend(commits, &models.Commit{
-			Hash:   t.Commit,
-			Name:   t.Msg,
-			Status: models.StatusRebasing,
-			Action: t.Command,
-		})
-	}
-
-	return commits
-}
-
-func (self *CommitLoader) getConflictedCommit(todos []todo.Todo) string {
-	bytesContent, err := self.readFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/done"))
-	if err != nil {
-		self.Log.Error(fmt.Sprintf("error occurred reading rebase-merge/done: %s", err.Error()))
-		return ""
-	}
-
-	doneTodos, err := todo.Parse(bytes.NewBuffer(bytesContent), self.config.GetCoreCommentChar())
-	if err != nil {
-		self.Log.Error(fmt.Sprintf("error occurred while parsing rebase-merge/done file: %s", err.Error()))
-		return ""
-	}
-
-	amendFileExists := false
-	if _, err := os.Stat(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/amend")); err == nil {
-		amendFileExists = true
-	}
-
-	return self.getConflictedCommitImpl(todos, doneTodos, amendFileExists)
-}
-
-func (self *CommitLoader) getConflictedCommitImpl(todos []todo.Todo, doneTodos []todo.Todo, amendFileExists bool) string {
-	// Should never be possible, but just to be safe:
-	if len(doneTodos) == 0 {
-		self.Log.Error("no done entries in rebase-merge/done file")
-		return ""
-	}
-	lastTodo := doneTodos[len(doneTodos)-1]
-	if lastTodo.Command == todo.Break || lastTodo.Command == todo.Exec || lastTodo.Command == todo.Reword {
-		return ""
-	}
-
-	// In certain cases, git reschedules commands that failed. One example is if
-	// a patch would overwrite an untracked file (another one is an "exec" that
-	// failed, but we don't care about that here because we dealt with exec
-	// already above). To detect this, compare the last command of the "done"
-	// file against the first command of "git-rebase-todo"; if they are the
-	// same, the command was rescheduled.
-	if len(doneTodos) > 0 && len(todos) > 0 && doneTodos[len(doneTodos)-1] == todos[0] {
-		// Command was rescheduled, no need to display it
-		return ""
-	}
-
-	// Older versions of git have a bug whereby, if a command is rescheduled,
-	// the last successful command is appended to the "done" file again. To
-	// detect this, we need to compare the second-to-last done entry against the
-	// first todo entry, and also compare the last done entry against the
-	// last-but-two done entry; this latter check is needed for the following
-	// case:
-	//   pick A
-	//   exec make test
-	//   pick B
-	//   exec make test
-	// If pick B fails with conflicts, then the "done" file contains
-	//   pick A
-	//   exec make test
-	//   pick B
-	// and git-rebase-todo contains
-	//   exec make test
-	// Without the last condition we would erroneously treat this as the exec
-	// command being rescheduled, so we wouldn't display our fake entry for
-	// "pick B".
-	if len(doneTodos) >= 3 && len(todos) > 0 && doneTodos[len(doneTodos)-2] == todos[0] &&
-		doneTodos[len(doneTodos)-1] == doneTodos[len(doneTodos)-3] {
-		// Command was rescheduled, no need to display it
-		return ""
-	}
-
-	if lastTodo.Command == todo.Edit {
-		if amendFileExists {
-			// Special case for "edit": if the "amend" file exists, the "edit"
-			// command was successful, otherwise it wasn't
-			return ""
-		}
-	}
-
-	// I don't think this is ever possible, but again, just to be safe:
-	if lastTodo.Commit == "" {
-		self.Log.Error("last command in rebase-merge/done file doesn't have a commit")
-		return ""
-	}
-
-	// Any other todo that has a commit associated with it must have failed with
-	// a conflict, otherwise we wouldn't have stopped the rebase:
-	return lastTodo.Commit
-}
-
-func setCommitMergedStatuses(ancestor string, commits []*models.Commit) {
-	if ancestor == "" {
-		return
-	}
-
-	passedAncestor := false
-	for i, commit := range commits {
-		// some commits aren't really commits and don't have hashes, such as the update-ref todo
-		if commit.Hash != "" && strings.HasPrefix(ancestor, commit.Hash) {
-			passedAncestor = true
-		}
-		if commit.Status != models.StatusPushed && commit.Status != models.StatusUnpushed {
-			continue
-		}
-		if passedAncestor {
-			commits[i].Status = models.StatusMerged
-		}
-	}
-}
-
-func ignoringWarnings(commandOutput string) string {
-	trimmedOutput := strings.TrimSpace(commandOutput)
-	split := strings.Split(trimmedOutput, "\n")
-	// need to get last line in case the first line is a warning about how the error is ambiguous.
-	// At some point we should find a way to make it unambiguous
-	lastLine := split[len(split)-1]
-
-	return lastLine
-}
-
-// getFirstPushedCommit returns the first commit hash which has been pushed to the ref's upstream.
-// all commits above this are deemed unpushed and marked as such.
-func (self *CommitLoader) getFirstPushedCommit(refName string) (string, error) {
-	output, err := self.cmd.New(
-		NewGitCmd("merge-base").
-			Arg(refName).
-			Arg(strings.TrimPrefix(refName, "refs/heads/") + "@{u}").
-			ToArgv(),
-	).
-		DontLog().
-		RunWithOutput()
-	if err != nil {
-		return "", err
-	}
-
-	return ignoringWarnings(output), nil
-}
-
-// getLog gets the git log.
-func (self *CommitLoader) getLogCmd(opts GetCommitsOptions) oscommands.ICmdObj {
-	gitLogOrder := self.AppState.GitLogOrder
-
-	refSpec := opts.RefName
-	if opts.RefToShowDivergenceFrom != "" {
-		refSpec += "..." + opts.RefToShowDivergenceFrom
-	}
-
-	cmdArgs := NewGitCmd("log").
-		Arg(refSpec).
-		ArgIf(gitLogOrder != "default", "--"+gitLogOrder).
-		ArgIf(opts.All, "--all").
-		Arg("--oneline").
-		Arg(prettyFormat).
-		Arg("--abbrev=40").
-		ArgIf(opts.FilterAuthor != "", "--author="+opts.FilterAuthor).
-		ArgIf(opts.Limit, "-300").
-		ArgIf(opts.FilterPath != "", "--follow").
-		Arg("--no-show-signature").
-		ArgIf(opts.RefToShowDivergenceFrom != "", "--left-right").
-		Arg("--").
-		ArgIf(opts.FilterPath != "", opts.FilterPath).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).DontLog()
-}
-
-const prettyFormat = `--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s`

pkg/commands/git_commands/commit_loader_test.go

@@ -1,560 +0,0 @@
-package git_commands
-
-import (
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/go-errors/errors"
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/stefanhaller/git-todo-parser/todo"
-	"github.com/stretchr/testify/assert"
-)
-
-var commitsOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|>|better typing for rebase mode
-b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164|1640824515|Jesse Duffield|jessedduffield@gmail.com|origin/better-tests|e94e8fc5b6fab4cb755f|>|fix logging
-e94e8fc5b6fab4cb755f29f1bdb3ee5e001df35c|1640823749|Jesse Duffield|jessedduffield@gmail.com|tag: 123, tag: 456|d8084cd558925eb7c9c3|>|refactor
-d8084cd558925eb7c9c38afeed5725c21653ab90|1640821426|Jesse Duffield|jessedduffield@gmail.com||65f910ebd85283b5cce9|>|WIP
-65f910ebd85283b5cce9bf67d03d3f1a9ea3813a|1640821275|Jesse Duffield|jessedduffield@gmail.com||26c07b1ab33860a1a759|>|WIP
-26c07b1ab33860a1a7591a0638f9925ccf497ffa|1640750752|Jesse Duffield|jessedduffield@gmail.com||3d4470a6c072208722e5|>|WIP
-3d4470a6c072208722e5ae9a54bcb9634959a1c5|1640748818|Jesse Duffield|jessedduffield@gmail.com||053a66a7be3da43aacdc|>|WIP
-053a66a7be3da43aacdc7aa78e1fe757b82c4dd2|1640739815|Jesse Duffield|jessedduffield@gmail.com||985fe482e806b172aea4|>|refactoring the config struct`, "|", "\x00", -1)
-
-var singleCommitOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|>|better typing for rebase mode`, "|", "\x00", -1)
-
-func TestGetCommits(t *testing.T) {
-	type scenario struct {
-		testName        string
-		runner          *oscommands.FakeCmdObjRunner
-		expectedCommits []*models.Commit
-		expectedError   error
-		logOrder        string
-		rebaseMode      enums.RebaseMode
-		opts            GetCommitsOptions
-		mainBranches    []string
-	}
-
-	scenarios := []scenario{
-		{
-			testName:   "should return no commits if there are none",
-			logOrder:   "topo-order",
-			rebaseMode: enums.REBASE_MODE_NONE,
-			opts:       GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
-			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
-
-			expectedCommits: []*models.Commit{},
-			expectedError:   nil,
-		},
-		{
-			testName:   "should use proper upstream name for branch",
-			logOrder:   "topo-order",
-			rebaseMode: enums.REBASE_MODE_NONE,
-			opts:       GetCommitsOptions{RefName: "refs/heads/mybranch", RefForPushedStatus: "refs/heads/mybranch", IncludeRebaseCommits: false},
-			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"merge-base", "refs/heads/mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				ExpectGitArgs([]string{"log", "refs/heads/mybranch", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
-
-			expectedCommits: []*models.Commit{},
-			expectedError:   nil,
-		},
-		{
-			testName:     "should return commits if they are present",
-			logOrder:     "topo-order",
-			rebaseMode:   enums.REBASE_MODE_NONE,
-			opts:         GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
-			mainBranches: []string{"master", "main", "develop"},
-			runner: oscommands.NewFakeRunner(t).
-				// here it's seeing which commits are yet to be pushed
-				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				// here it's actually getting all the commits in a formatted form, one per line
-				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, commitsOutput, nil).
-				// here it's testing which of the configured main branches have an upstream
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "master@{u}"}, "refs/remotes/origin/master", nil).       // this one does
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "main@{u}"}, "", errors.New("error")).                   // this one doesn't, so it checks origin instead
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/remotes/origin/main"}, "", nil).                    // yep, origin/main exists
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "develop@{u}"}, "", errors.New("error")).                // this one doesn't, so it checks origin instead
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/remotes/origin/develop"}, "", errors.New("error")). // doesn't exist there, either, so it checks for a local branch
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/heads/develop"}, "", errors.New("error")).          // no local branch either
-				// here it's seeing where our branch diverged from the master branch so that we can mark that commit and parent commits as 'merged'
-				ExpectGitArgs([]string{"merge-base", "HEAD", "refs/remotes/origin/master", "refs/remotes/origin/main"}, "26c07b1ab33860a1a7591a0638f9925ccf497ffa", nil),
-
-			expectedCommits: []*models.Commit{
-				{
-					Hash:          "0eea75e8c631fba6b58135697835d58ba4c18dbc",
-					Name:          "better typing for rebase mode",
-					Status:        models.StatusUnpushed,
-					Action:        models.ActionNone,
-					Tags:          []string{},
-					ExtraInfo:     "(HEAD -> better-tests)",
-					AuthorName:    "Jesse Duffield",
-					AuthorEmail:   "jessedduffield@gmail.com",
-					UnixTimestamp: 1640826609,
-					Parents: []string{
-						"b21997d6b4cbdf84b149",
-					},
-				},
-				{
-					Hash:          "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164",
-					Name:          "fix logging",
-					Status:        models.StatusPushed,
-					Action:        models.ActionNone,
-					Tags:          []string{},
-					ExtraInfo:     "(origin/better-tests)",
-					AuthorName:    "Jesse Duffield",
-					AuthorEmail:   "jessedduffield@gmail.com",
-					UnixTimestamp: 1640824515,
-					Parents: []string{
-						"e94e8fc5b6fab4cb755f",
-					},
-				},
-				{
-					Hash:          "e94e8fc5b6fab4cb755f29f1bdb3ee5e001df35c",
-					Name:          "refactor",
-					Status:        models.StatusPushed,
-					Action:        models.ActionNone,
-					Tags:          []string{"123", "456"},
-					ExtraInfo:     "(tag: 123, tag: 456)",
-					AuthorName:    "Jesse Duffield",
-					AuthorEmail:   "jessedduffield@gmail.com",
-					UnixTimestamp: 1640823749,
-					Parents: []string{
-						"d8084cd558925eb7c9c3",
-					},
-				},
-				{
-					Hash:          "d8084cd558925eb7c9c38afeed5725c21653ab90",
-					Name:          "WIP",
-					Status:        models.StatusPushed,
-					Action:        models.ActionNone,
-					Tags:          []string{},
-					ExtraInfo:     "",
-					AuthorName:    "Jesse Duffield",
-					AuthorEmail:   "jessedduffield@gmail.com",
-					UnixTimestamp: 1640821426,
-					Parents: []string{
-						"65f910ebd85283b5cce9",
-					},
-				},
-				{
-					Hash:          "65f910ebd85283b5cce9bf67d03d3f1a9ea3813a",
-					Name:          "WIP",
-					Status:        models.StatusPushed,
-					Action:        models.ActionNone,
-					Tags:          []string{},
-					ExtraInfo:     "",
-					AuthorName:    "Jesse Duffield",
-					AuthorEmail:   "jessedduffield@gmail.com",
-					UnixTimestamp: 1640821275,
-					Parents: []string{
-						"26c07b1ab33860a1a759",
-					},
-				},
-				{
-					Hash:          "26c07b1ab33860a1a7591a0638f9925ccf497ffa",
-					Name:          "WIP",
-					Status:        models.StatusMerged,
-					Action:        models.ActionNone,
-					Tags:          []string{},
-					ExtraInfo:     "",
-					AuthorName:    "Jesse Duffield",
-					AuthorEmail:   "jessedduffield@gmail.com",
-					UnixTimestamp: 1640750752,
-					Parents: []string{
-						"3d4470a6c072208722e5",
-					},
-				},
-				{
-					Hash:          "3d4470a6c072208722e5ae9a54bcb9634959a1c5",
-					Name:          "WIP",
-					Status:        models.StatusMerged,
-					Action:        models.ActionNone,
-					Tags:          []string{},
-					ExtraInfo:     "",
-					AuthorName:    "Jesse Duffield",
-					AuthorEmail:   "jessedduffield@gmail.com",
-					UnixTimestamp: 1640748818,
-					Parents: []string{
-						"053a66a7be3da43aacdc",
-					},
-				},
-				{
-					Hash:          "053a66a7be3da43aacdc7aa78e1fe757b82c4dd2",
-					Name:          "refactoring the config struct",
-					Status:        models.StatusMerged,
-					Action:        models.ActionNone,
-					Tags:          []string{},
-					ExtraInfo:     "",
-					AuthorName:    "Jesse Duffield",
-					AuthorEmail:   "jessedduffield@gmail.com",
-					UnixTimestamp: 1640739815,
-					Parents: []string{
-						"985fe482e806b172aea4",
-					},
-				},
-			},
-			expectedError: nil,
-		},
-		{
-			testName:     "should not call merge-base for mainBranches if none exist",
-			logOrder:     "topo-order",
-			rebaseMode:   enums.REBASE_MODE_NONE,
-			opts:         GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
-			mainBranches: []string{"master", "main"},
-			runner: oscommands.NewFakeRunner(t).
-				// here it's seeing which commits are yet to be pushed
-				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				// here it's actually getting all the commits in a formatted form, one per line
-				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, singleCommitOutput, nil).
-				// here it's testing which of the configured main branches exist; neither does
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "master@{u}"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/remotes/origin/master"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/heads/master"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "main@{u}"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/remotes/origin/main"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/heads/main"}, "", errors.New("error")),
-
-			expectedCommits: []*models.Commit{
-				{
-					Hash:          "0eea75e8c631fba6b58135697835d58ba4c18dbc",
-					Name:          "better typing for rebase mode",
-					Status:        models.StatusUnpushed,
-					Action:        models.ActionNone,
-					Tags:          []string{},
-					ExtraInfo:     "(HEAD -> better-tests)",
-					AuthorName:    "Jesse Duffield",
-					AuthorEmail:   "jessedduffield@gmail.com",
-					UnixTimestamp: 1640826609,
-					Parents: []string{
-						"b21997d6b4cbdf84b149",
-					},
-				},
-			},
-			expectedError: nil,
-		},
-		{
-			testName:     "should call merge-base for all main branches that exist",
-			logOrder:     "topo-order",
-			rebaseMode:   enums.REBASE_MODE_NONE,
-			opts:         GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
-			mainBranches: []string{"master", "main", "develop", "1.0-hotfixes"},
-			runner: oscommands.NewFakeRunner(t).
-				// here it's seeing which commits are yet to be pushed
-				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				// here it's actually getting all the commits in a formatted form, one per line
-				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, singleCommitOutput, nil).
-				// here it's testing which of the configured main branches exist
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "master@{u}"}, "refs/remotes/origin/master", nil).
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "main@{u}"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/remotes/origin/main"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/heads/main"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "develop@{u}"}, "refs/remotes/origin/develop", nil).
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "1.0-hotfixes@{u}"}, "refs/remotes/origin/1.0-hotfixes", nil).
-				// here it's seeing where our branch diverged from the master branch so that we can mark that commit and parent commits as 'merged'
-				ExpectGitArgs([]string{"merge-base", "HEAD", "refs/remotes/origin/master", "refs/remotes/origin/develop", "refs/remotes/origin/1.0-hotfixes"}, "26c07b1ab33860a1a7591a0638f9925ccf497ffa", nil),
-
-			expectedCommits: []*models.Commit{
-				{
-					Hash:          "0eea75e8c631fba6b58135697835d58ba4c18dbc",
-					Name:          "better typing for rebase mode",
-					Status:        models.StatusUnpushed,
-					Action:        models.ActionNone,
-					Tags:          []string{},
-					ExtraInfo:     "(HEAD -> better-tests)",
-					AuthorName:    "Jesse Duffield",
-					AuthorEmail:   "jessedduffield@gmail.com",
-					UnixTimestamp: 1640826609,
-					Parents: []string{
-						"b21997d6b4cbdf84b149",
-					},
-				},
-			},
-			expectedError: nil,
-		},
-		{
-			testName:   "should not specify order if `log.order` is `default`",
-			logOrder:   "default",
-			rebaseMode: enums.REBASE_MODE_NONE,
-			opts:       GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
-			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				ExpectGitArgs([]string{"log", "HEAD", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
-
-			expectedCommits: []*models.Commit{},
-			expectedError:   nil,
-		},
-		{
-			testName:   "should set filter path",
-			logOrder:   "default",
-			rebaseMode: enums.REBASE_MODE_NONE,
-			opts:       GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", FilterPath: "src"},
-			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				ExpectGitArgs([]string{"log", "HEAD", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--follow", "--no-show-signature", "--", "src"}, "", nil),
-
-			expectedCommits: []*models.Commit{},
-			expectedError:   nil,
-		},
-	}
-
-	for _, scenario := range scenarios {
-		t.Run(scenario.testName, func(t *testing.T) {
-			common := utils.NewDummyCommon()
-			common.AppState = &config.AppState{}
-			common.AppState.GitLogOrder = scenario.logOrder
-			cmd := oscommands.NewDummyCmdObjBuilder(scenario.runner)
-
-			builder := &CommitLoader{
-				Common:        common,
-				cmd:           cmd,
-				getRebaseMode: func() (enums.RebaseMode, error) { return scenario.rebaseMode, nil },
-				dotGitDir:     ".git",
-				readFile: func(filename string) ([]byte, error) {
-					return []byte(""), nil
-				},
-				walkFiles: func(root string, fn filepath.WalkFunc) error {
-					return nil
-				},
-			}
-
-			common.UserConfig.Git.MainBranches = scenario.mainBranches
-			opts := scenario.opts
-			opts.MainBranches = NewMainBranches(scenario.mainBranches, cmd)
-			commits, err := builder.GetCommits(opts)
-
-			assert.Equal(t, scenario.expectedCommits, commits)
-			assert.Equal(t, scenario.expectedError, err)
-
-			scenario.runner.CheckForMissingCalls()
-		})
-	}
-}
-
-func TestCommitLoader_getConflictedCommitImpl(t *testing.T) {
-	scenarios := []struct {
-		testName        string
-		todos           []todo.Todo
-		doneTodos       []todo.Todo
-		amendFileExists bool
-		expectedHash    string
-	}{
-		{
-			testName:        "no done todos",
-			todos:           []todo.Todo{},
-			doneTodos:       []todo.Todo{},
-			amendFileExists: false,
-			expectedHash:    "",
-		},
-		{
-			testName: "common case (conflict)",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "deadbeef",
-				},
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-			},
-			amendFileExists: false,
-			expectedHash:    "fa1afe1",
-		},
-		{
-			testName: "last command was 'break'",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{Command: todo.Break},
-			},
-			amendFileExists: false,
-			expectedHash:    "",
-		},
-		{
-			testName: "last command was 'exec'",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{
-					Command:     todo.Exec,
-					ExecCommand: "make test",
-				},
-			},
-			amendFileExists: false,
-			expectedHash:    "",
-		},
-		{
-			testName: "last command was 'reword'",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{Command: todo.Reword},
-			},
-			amendFileExists: false,
-			expectedHash:    "",
-		},
-		{
-			testName: "'pick' was rescheduled",
-			todos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-			},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-			},
-			amendFileExists: false,
-			expectedHash:    "",
-		},
-		{
-			testName: "'pick' was rescheduled, buggy git version",
-			todos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-			},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "deadbeaf",
-				},
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-				{
-					Command: todo.Pick,
-					Commit:  "deadbeaf",
-				},
-			},
-			amendFileExists: false,
-			expectedHash:    "",
-		},
-		{
-			testName: "conflicting 'pick' after 'exec'",
-			todos: []todo.Todo{
-				{
-					Command:     todo.Exec,
-					ExecCommand: "make test",
-				},
-			},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "deadbeaf",
-				},
-				{
-					Command:     todo.Exec,
-					ExecCommand: "make test",
-				},
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-			},
-			amendFileExists: false,
-			expectedHash:    "fa1afe1",
-		},
-		{
-			testName: "'edit' with amend file",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Edit,
-					Commit:  "fa1afe1",
-				},
-			},
-			amendFileExists: true,
-			expectedHash:    "",
-		},
-		{
-			testName: "'edit' without amend file",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Edit,
-					Commit:  "fa1afe1",
-				},
-			},
-			amendFileExists: false,
-			expectedHash:    "fa1afe1",
-		},
-	}
-	for _, scenario := range scenarios {
-		t.Run(scenario.testName, func(t *testing.T) {
-			common := utils.NewDummyCommon()
-
-			builder := &CommitLoader{
-				Common:        common,
-				cmd:           oscommands.NewDummyCmdObjBuilder(oscommands.NewFakeRunner(t)),
-				getRebaseMode: func() (enums.RebaseMode, error) { return enums.REBASE_MODE_INTERACTIVE, nil },
-				dotGitDir:     ".git",
-				readFile: func(filename string) ([]byte, error) {
-					return []byte(""), nil
-				},
-				walkFiles: func(root string, fn filepath.WalkFunc) error {
-					return nil
-				},
-			}
-
-			hash := builder.getConflictedCommitImpl(scenario.todos, scenario.doneTodos, scenario.amendFileExists)
-			assert.Equal(t, scenario.expectedHash, hash)
-		})
-	}
-}
-
-func TestCommitLoader_setCommitMergedStatuses(t *testing.T) {
-	type scenario struct {
-		testName        string
-		commits         []*models.Commit
-		ancestor        string
-		expectedCommits []*models.Commit
-	}
-
-	scenarios := []scenario{
-		{
-			testName: "basic",
-			commits: []*models.Commit{
-				{Hash: "12345", Name: "1", Action: models.ActionNone, Status: models.StatusUnpushed},
-				{Hash: "67890", Name: "2", Action: models.ActionNone, Status: models.StatusPushed},
-				{Hash: "abcde", Name: "3", Action: models.ActionNone, Status: models.StatusPushed},
-			},
-			ancestor: "67890",
-			expectedCommits: []*models.Commit{
-				{Hash: "12345", Name: "1", Action: models.ActionNone, Status: models.StatusUnpushed},
-				{Hash: "67890", Name: "2", Action: models.ActionNone, Status: models.StatusMerged},
-				{Hash: "abcde", Name: "3", Action: models.ActionNone, Status: models.StatusMerged},
-			},
-		},
-		{
-			testName: "with update-ref",
-			commits: []*models.Commit{
-				{Hash: "12345", Name: "1", Action: models.ActionNone, Status: models.StatusUnpushed},
-				{Hash: "", Name: "", Action: todo.UpdateRef, Status: models.StatusNone},
-				{Hash: "abcde", Name: "3", Action: models.ActionNone, Status: models.StatusPushed},
-			},
-			ancestor: "deadbeef",
-			expectedCommits: []*models.Commit{
-				{Hash: "12345", Name: "1", Action: models.ActionNone, Status: models.StatusUnpushed},
-				{Hash: "", Name: "", Action: todo.UpdateRef, Status: models.StatusNone},
-				{Hash: "abcde", Name: "3", Action: models.ActionNone, Status: models.StatusPushed},
-			},
-		},
-	}
-
-	for _, scenario := range scenarios {
-		t.Run(scenario.testName, func(t *testing.T) {
-			expectedCommits := scenario.commits
-			setCommitMergedStatuses(scenario.ancestor, expectedCommits)
-			assert.Equal(t, scenario.expectedCommits, expectedCommits)
-		})
-	}
-}

pkg/commands/git_commands/commit_test.go

@@ -9,34 +9,12 @@ import (
 )
 
 func TestCommitRewordCommit(t *testing.T) {
-	type scenario struct {
-		testName    string
-		runner      *oscommands.FakeCmdObjRunner
-		summary     string
-		description string
-	}
-	scenarios := []scenario{
-		{
-			"Single line reword",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"commit", "--allow-empty", "--amend", "--only", "-m", "test"}, "", nil),
-			"test",
-			"",
-		},
-		{
-			"Multi line reword",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"commit", "--allow-empty", "--amend", "--only", "-m", "test", "-m", "line 2\nline 3"}, "", nil),
-			"test",
-			"line 2\nline 3",
-		},
-	}
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			instance := buildCommitCommands(commonDeps{runner: s.runner})
+	runner := oscommands.NewFakeRunner(t).
+		ExpectGitArgs([]string{"commit", "--allow-empty", "--amend", "--only", "-m", "test"}, "", nil)
+	instance := buildCommitCommands(commonDeps{runner: runner})
 
-			assert.NoError(t, instance.RewordLastCommit(s.summary, s.description))
-			s.runner.CheckForMissingCalls()
-		})
-	}
+	assert.NoError(t, instance.RewordLastCommit("test"))
+	runner.CheckForMissingCalls()
 }
 
 func TestCommitResetToCommit(t *testing.T) {
@@ -49,100 +27,64 @@ func TestCommitResetToCommit(t *testing.T) {
 	runner.CheckForMissingCalls()
 }
 
-func TestCommitCommitCmdObj(t *testing.T) {
+func TestCommitCommitObj(t *testing.T) {
 	type scenario struct {
 		testName             string
-		summary              string
-		description          string
+		message              string
 		configSignoff        bool
 		configSkipHookPrefix string
-		expectedArgs         []string
+		expected             string
 	}
 
 	scenarios := []scenario{
 		{
 			testName:             "Commit",
-			summary:              "test",
+			message:              "test",
 			configSignoff:        false,
 			configSkipHookPrefix: "",
-			expectedArgs:         []string{"commit", "-m", "test"},
+			expected:             `git commit -m "test"`,
 		},
 		{
 			testName:             "Commit with --no-verify flag",
-			summary:              "WIP: test",
+			message:              "WIP: test",
 			configSignoff:        false,
 			configSkipHookPrefix: "WIP",
-			expectedArgs:         []string{"commit", "--no-verify", "-m", "WIP: test"},
+			expected:             `git commit --no-verify -m "WIP: test"`,
 		},
 		{
 			testName:             "Commit with multiline message",
-			summary:              "line1",
-			description:          "line2",
+			message:              "line1\nline2",
 			configSignoff:        false,
 			configSkipHookPrefix: "",
-			expectedArgs:         []string{"commit", "-m", "line1", "-m", "line2"},
+			expected:             `git commit -m "line1" -m "line2"`,
 		},
 		{
 			testName:             "Commit with signoff",
-			summary:              "test",
+			message:              "test",
 			configSignoff:        true,
 			configSkipHookPrefix: "",
-			expectedArgs:         []string{"commit", "--signoff", "-m", "test"},
+			expected:             `git commit --signoff -m "test"`,
 		},
 		{
 			testName:             "Commit with signoff and no-verify",
-			summary:              "WIP: test",
+			message:              "WIP: test",
 			configSignoff:        true,
 			configSkipHookPrefix: "WIP",
-			expectedArgs:         []string{"commit", "--no-verify", "--signoff", "-m", "WIP: test"},
+			expected:             `git commit --no-verify --signoff -m "WIP: test"`,
 		},
 	}
 
 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
 			userConfig.Git.Commit.SignOff = s.configSignoff
 			userConfig.Git.SkipHookPrefix = s.configSkipHookPrefix
 
-			runner := oscommands.NewFakeRunner(t).ExpectGitArgs(s.expectedArgs, "", nil)
-			instance := buildCommitCommands(commonDeps{userConfig: userConfig, runner: runner})
+			instance := buildCommitCommands(commonDeps{userConfig: userConfig})
 
-			assert.NoError(t, instance.CommitCmdObj(s.summary, s.description).Run())
-			runner.CheckForMissingCalls()
-		})
-	}
-}
-
-func TestCommitCommitEditorCmdObj(t *testing.T) {
-	type scenario struct {
-		testName      string
-		configSignoff bool
-		expected      []string
-	}
-
-	scenarios := []scenario{
-		{
-			testName:      "Commit using editor",
-			configSignoff: false,
-			expected:      []string{"commit"},
-		},
-		{
-			testName:      "Commit with --signoff",
-			configSignoff: true,
-			expected:      []string{"commit", "--signoff"},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			userConfig := config.GetDefaultConfig()
-			userConfig.Git.Commit.SignOff = s.configSignoff
-
-			runner := oscommands.NewFakeRunner(t).ExpectGitArgs(s.expected, "", nil)
-			instance := buildCommitCommands(commonDeps{userConfig: userConfig, runner: runner})
-
-			assert.NoError(t, instance.CommitEditorCmdObj().Run())
-			runner.CheckForMissingCalls()
+			cmdStr := instance.CommitCmdObj(s.message).ToString()
+			assert.Equal(t, s.expected, cmdStr)
 		})
 	}
 }
@@ -150,7 +92,7 @@ func TestCommitCommitEditorCmdObj(t *testing.T) {
 func TestCommitCreateFixupCommit(t *testing.T) {
 	type scenario struct {
 		testName string
-		hash     string
+		sha      string
 		runner   *oscommands.FakeCmdObjRunner
 		test     func(error)
 	}
@@ -158,9 +100,9 @@ func TestCommitCreateFixupCommit(t *testing.T) {
 	scenarios := []scenario{
 		{
 			testName: "valid case",
-			hash:     "12345",
+			sha:      "12345",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"commit", "--fixup=12345"}, "", nil),
+				Expect(`git commit --fixup=12345`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -168,59 +110,10 @@ func TestCommitCreateFixupCommit(t *testing.T) {
 	}
 
 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildCommitCommands(commonDeps{runner: s.runner})
-			s.test(instance.CreateFixupCommit(s.hash))
-			s.runner.CheckForMissingCalls()
-		})
-	}
-}
-
-func TestCommitCreateAmendCommit(t *testing.T) {
-	type scenario struct {
-		testName           string
-		originalSubject    string
-		newSubject         string
-		newDescription     string
-		includeFileChanges bool
-		runner             *oscommands.FakeCmdObjRunner
-	}
-
-	scenarios := []scenario{
-		{
-			testName:           "subject only",
-			originalSubject:    "original subject",
-			newSubject:         "new subject",
-			newDescription:     "",
-			includeFileChanges: true,
-			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"commit", "-m", "amend! original subject", "-m", "new subject"}, "", nil),
-		},
-		{
-			testName:           "subject and description",
-			originalSubject:    "original subject",
-			newSubject:         "new subject",
-			newDescription:     "new description",
-			includeFileChanges: true,
-			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"commit", "-m", "amend! original subject", "-m", "new subject\n\nnew description"}, "", nil),
-		},
-		{
-			testName:           "without file changes",
-			originalSubject:    "original subject",
-			newSubject:         "new subject",
-			newDescription:     "",
-			includeFileChanges: false,
-			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"commit", "-m", "amend! original subject", "-m", "new subject", "--only", "--allow-empty"}, "", nil),
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			instance := buildCommitCommands(commonDeps{runner: s.runner})
-			err := instance.CreateAmendCommit(s.originalSubject, s.newSubject, s.newDescription, s.includeFileChanges)
-			assert.NoError(t, err)
+			s.test(instance.CreateFixupCommit(s.sha))
 			s.runner.CheckForMissingCalls()
 		})
 	}
@@ -228,218 +121,43 @@ func TestCommitCreateAmendCommit(t *testing.T) {
 
 func TestCommitShowCmdObj(t *testing.T) {
 	type scenario struct {
-		testName         string
-		filterPath       string
-		contextSize      int
-		ignoreWhitespace bool
-		extDiffCmd       string
-		expected         []string
+		testName    string
+		filterPath  string
+		contextSize int
+		expected    string
 	}
 
 	scenarios := []scenario{
 		{
-			testName:         "Default case without filter path",
-			filterPath:       "",
-			contextSize:      3,
-			ignoreWhitespace: false,
-			extDiffCmd:       "",
-			expected:         []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890"},
+			testName:    "Default case without filter path",
+			filterPath:  "",
+			contextSize: 3,
+			expected:    "git show --submodule --color=always --unified=3 --no-renames --stat -p 1234567890 ",
 		},
 		{
-			testName:         "Default case with filter path",
-			filterPath:       "file.txt",
-			contextSize:      3,
-			ignoreWhitespace: false,
-			extDiffCmd:       "",
-			expected:         []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--", "file.txt"},
+			testName:    "Default case with filter path",
+			filterPath:  "file.txt",
+			contextSize: 3,
+			expected:    `git show --submodule --color=always --unified=3 --no-renames --stat -p 1234567890  -- "file.txt"`,
 		},
 		{
-			testName:         "Show diff with custom context size",
-			filterPath:       "",
-			contextSize:      77,
-			ignoreWhitespace: false,
-			extDiffCmd:       "",
-			expected:         []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890"},
-		},
-		{
-			testName:         "Show diff, ignoring whitespace",
-			filterPath:       "",
-			contextSize:      77,
-			ignoreWhitespace: true,
-			extDiffCmd:       "",
-			expected:         []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890", "--ignore-all-space"},
-		},
-		{
-			testName:         "Show diff with external diff command",
-			filterPath:       "",
-			contextSize:      3,
-			ignoreWhitespace: false,
-			extDiffCmd:       "difft --color=always",
-			expected:         []string{"-C", "/path/to/worktree", "-c", "diff.external=difft --color=always", "-c", "diff.noprefix=false", "show", "--ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890"},
+			testName:    "Show diff with custom context size",
+			filterPath:  "",
+			contextSize: 77,
+			expected:    "git show --submodule --color=always --unified=77 --no-renames --stat -p 1234567890 ",
 		},
 	}
 
 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
-			userConfig.Git.Paging.ExternalDiffCommand = s.extDiffCmd
-			appState := &config.AppState{}
-			appState.IgnoreWhitespaceInDiffView = s.ignoreWhitespace
-			appState.DiffContextSize = s.contextSize
+			userConfig.Git.DiffContextSize = s.contextSize
 
-			runner := oscommands.NewFakeRunner(t).ExpectGitArgs(s.expected, "", nil)
-			repoPaths := RepoPaths{
-				worktreePath: "/path/to/worktree",
-			}
-			instance := buildCommitCommands(commonDeps{userConfig: userConfig, appState: appState, runner: runner, repoPaths: &repoPaths})
+			instance := buildCommitCommands(commonDeps{userConfig: userConfig})
 
-			assert.NoError(t, instance.ShowCmdObj("1234567890", s.filterPath).Run())
-			runner.CheckForMissingCalls()
-		})
-	}
-}
-
-func TestGetCommitMsg(t *testing.T) {
-	type scenario struct {
-		testName       string
-		input          string
-		expectedOutput string
-	}
-	scenarios := []scenario{
-		{
-			"empty",
-			``,
-			``,
-		},
-		{
-			"no line breaks (single line)",
-			`use generics to DRY up context code`,
-			`use generics to DRY up context code`,
-		},
-		{
-			"with line breaks",
-			`Merge pull request #1750 from mark2185/fix-issue-template
-
-'git-rev parse' should be 'git rev-parse'`,
-			`Merge pull request #1750 from mark2185/fix-issue-template
-
-'git-rev parse' should be 'git rev-parse'`,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			instance := buildCommitCommands(commonDeps{
-				runner: oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"-c", "log.showsignature=false", "log", "--format=%B", "--max-count=1", "deadbeef"}, s.input, nil),
-			})
-
-			output, err := instance.GetCommitMessage("deadbeef")
-
-			assert.NoError(t, err)
-
-			assert.Equal(t, s.expectedOutput, output)
-		})
-	}
-}
-
-func TestGetCommitMessageFromHistory(t *testing.T) {
-	type scenario struct {
-		testName string
-		runner   *oscommands.FakeCmdObjRunner
-		test     func(string, error)
-	}
-	scenarios := []scenario{
-		{
-			"Empty message",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"log", "-1", "--skip=2", "--pretty=%H"}, "", nil).ExpectGitArgs([]string{"-c", "log.showsignature=false", "log", "--format=%B", "--max-count=1"}, "", nil),
-			func(output string, err error) {
-				assert.Error(t, err)
-			},
-		},
-		{
-			"Default case to retrieve a commit in history",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"log", "-1", "--skip=2", "--pretty=%H"}, "hash3 \n", nil).ExpectGitArgs([]string{"-c", "log.showsignature=false", "log", "--format=%B", "--max-count=1", "hash3"}, `use generics to DRY up context code`, nil),
-			func(output string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, "use generics to DRY up context code", output)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			instance := buildCommitCommands(commonDeps{runner: s.runner})
-
-			output, err := instance.GetCommitMessageFromHistory(2)
-
-			s.test(output, err)
-		})
-	}
-}
-
-func TestAddCoAuthorToMessage(t *testing.T) {
-	scenarios := []struct {
-		name           string
-		message        string
-		expectedResult string
-	}{
-		{
-			// This never happens, I think it isn't possible to create a commit
-			// with an empty message. Just including it for completeness.
-			name:           "Empty message",
-			message:        "",
-			expectedResult: "\n\nCo-authored-by: John Doe <john@doe.com>",
-		},
-		{
-			name:           "Just a subject, no body",
-			message:        "Subject",
-			expectedResult: "Subject\n\nCo-authored-by: John Doe <john@doe.com>",
-		},
-		{
-			name:           "Subject and body",
-			message:        "Subject\n\nBody",
-			expectedResult: "Subject\n\nBody\n\nCo-authored-by: John Doe <john@doe.com>",
-		},
-		{
-			name:           "Body already ending with a Co-authored-by line",
-			message:        "Subject\n\nBody\n\nCo-authored-by: Jane Smith <jane@smith.com>",
-			expectedResult: "Subject\n\nBody\n\nCo-authored-by: Jane Smith <jane@smith.com>\nCo-authored-by: John Doe <john@doe.com>",
-		},
-	}
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			result := AddCoAuthorToMessage(s.message, "John Doe <john@doe.com>")
-			assert.Equal(t, s.expectedResult, result)
-		})
-	}
-}
-
-func TestAddCoAuthorToDescription(t *testing.T) {
-	scenarios := []struct {
-		name           string
-		description    string
-		expectedResult string
-	}{
-		{
-			name:           "Empty description",
-			description:    "",
-			expectedResult: "Co-authored-by: John Doe <john@doe.com>",
-		},
-		{
-			name:           "Non-empty description",
-			description:    "Body",
-			expectedResult: "Body\n\nCo-authored-by: John Doe <john@doe.com>",
-		},
-		{
-			name:           "Description already ending with a Co-authored-by line",
-			description:    "Body\n\nCo-authored-by: Jane Smith <jane@smith.com>",
-			expectedResult: "Body\n\nCo-authored-by: Jane Smith <jane@smith.com>\nCo-authored-by: John Doe <john@doe.com>",
-		},
-	}
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			result := AddCoAuthorToDescription(s.description, "John Doe <john@doe.com>")
-			assert.Equal(t, s.expectedResult, result)
+			cmdStr := instance.ShowCmdObj("1234567890", s.filterPath).ToString()
+			assert.Equal(t, s.expected, cmdStr)
 		})
 	}
 }

pkg/commands/git_commands/common.go

@@ -1,37 +0,0 @@
-package git_commands
-
-import (
-	gogit "github.com/jesseduffield/go-git/v5"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/common"
-)
-
-type GitCommon struct {
-	*common.Common
-	version   *GitVersion
-	cmd       oscommands.ICmdObjBuilder
-	os        *oscommands.OSCommand
-	repoPaths *RepoPaths
-	repo      *gogit.Repository
-	config    *ConfigCommands
-}
-
-func NewGitCommon(
-	cmn *common.Common,
-	version *GitVersion,
-	cmd oscommands.ICmdObjBuilder,
-	osCommand *oscommands.OSCommand,
-	repoPaths *RepoPaths,
-	repo *gogit.Repository,
-	config *ConfigCommands,
-) *GitCommon {
-	return &GitCommon{
-		Common:    cmn,
-		version:   version,
-		cmd:       cmd,
-		os:        osCommand,
-		repoPaths: repoPaths,
-		repo:      repo,
-		config:    config,
-	}
-}

pkg/commands/git_commands/config.go

@@ -53,7 +53,7 @@ func (self *ConfigCommands) GetPager(width int) string {
 		"columnWidth": strconv.Itoa(width/2 - 6),
 	}
 
-	pagerTemplate := string(self.UserConfig.Git.Paging.Pager)
+	pagerTemplate := self.UserConfig.Git.Paging.Pager
 	return utils.ResolvePlaceholderString(pagerTemplate, templateValues)
 }
 
@@ -99,15 +99,3 @@ func (self *ConfigCommands) Branches() (map[string]*config.Branch, error) {
 func (self *ConfigCommands) GetGitFlowPrefixes() string {
 	return self.gitConfig.GetGeneral("--local --get-regexp gitflow.prefix")
 }
-
-func (self *ConfigCommands) GetCoreCommentChar() byte {
-	if commentCharStr := self.gitConfig.Get("core.commentChar"); len(commentCharStr) == 1 {
-		return commentCharStr[0]
-	}
-
-	return '#'
-}
-
-func (self *ConfigCommands) GetRebaseUpdateRefs() bool {
-	return self.gitConfig.GetBool("rebase.updateRefs")
-}

pkg/commands/git_commands/custom.go

@@ -1,14 +1,23 @@
 package git_commands
 
-import "github.com/mgutz/str"
+import (
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
+)
 
 type CustomCommands struct {
-	*GitCommon
+	*common.Common
+
+	cmd oscommands.ICmdObjBuilder
 }
 
-func NewCustomCommands(gitCommon *GitCommon) *CustomCommands {
+func NewCustomCommands(
+	common *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+) *CustomCommands {
 	return &CustomCommands{
-		GitCommon: gitCommon,
+		Common: common,
+		cmd:    cmd,
 	}
 }
 
@@ -16,5 +25,5 @@ func NewCustomCommands(gitCommon *GitCommon) *CustomCommands {
 // If you want to run a new command, try finding a place for it in one of the neighbouring
 // files, or creating a new BlahCommands struct to hold it.
 func (self *CustomCommands) RunWithOutput(cmdStr string) (string, error) {
-	return self.cmd.New(str.ToArgv(cmdStr)).RunWithOutput()
+	return self.cmd.New(cmdStr).RunWithOutput()
 }

pkg/commands/git_commands/deps_test.go

@@ -1,187 +1,141 @@
 package git_commands
 
 import (
-	"os"
-
 	"github.com/go-errors/errors"
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
+	"github.com/jesseduffield/lazygit/pkg/commands/loaders"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/commands/patch"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/spf13/afero"
 )
 
 type commonDeps struct {
 	runner     *oscommands.FakeCmdObjRunner
 	userConfig *config.UserConfig
-	appState   *config.AppState
-	gitVersion *GitVersion
 	gitConfig  *git_config.FakeGitConfig
 	getenv     func(string) string
 	removeFile func(string) error
+	dotGitDir  string
 	common     *common.Common
 	cmd        *oscommands.CmdObjBuilder
-	fs         afero.Fs
-	repoPaths  *RepoPaths
 }
 
-func buildGitCommon(deps commonDeps) *GitCommon {
-	gitCommon := &GitCommon{}
-
-	gitCommon.Common = deps.common
-	if gitCommon.Common == nil {
-		gitCommon.Common = utils.NewDummyCommonWithUserConfigAndAppState(deps.userConfig, deps.appState)
+func completeDeps(deps commonDeps) commonDeps {
+	if deps.runner == nil {
+		deps.runner = oscommands.NewFakeRunner(nil)
 	}
 
-	if deps.fs != nil {
-		gitCommon.Fs = deps.fs
+	if deps.userConfig == nil {
+		deps.userConfig = config.GetDefaultConfig()
 	}
 
-	if deps.repoPaths != nil {
-		gitCommon.repoPaths = deps.repoPaths
-	} else {
-		gitCommon.repoPaths = MockRepoPaths(".git")
+	if deps.gitConfig == nil {
+		deps.gitConfig = git_config.NewFakeGitConfig(nil)
 	}
 
-	runner := deps.runner
-	if runner == nil {
-		runner = oscommands.NewFakeRunner(nil)
+	if deps.getenv == nil {
+		deps.getenv = func(string) string { return "" }
 	}
 
-	cmd := deps.cmd
-	// gotta check deps.cmd because it's not an interface type and an interface value of nil is not considered to be nil
-	if cmd == nil {
-		cmd = oscommands.NewDummyCmdObjBuilder(runner)
-	}
-	gitCommon.cmd = cmd
-
-	gitCommon.Common.UserConfig = deps.userConfig
-	if gitCommon.Common.UserConfig == nil {
-		gitCommon.Common.UserConfig = config.GetDefaultConfig()
+	if deps.removeFile == nil {
+		deps.removeFile = func(string) error { return errors.New("unexpected call to removeFile") }
 	}
 
-	gitCommon.version = deps.gitVersion
-	if gitCommon.version == nil {
-		gitCommon.version = &GitVersion{2, 0, 0, ""}
+	if deps.dotGitDir == "" {
+		deps.dotGitDir = ".git"
 	}
 
-	gitConfig := deps.gitConfig
-	if gitConfig == nil {
-		gitConfig = git_config.NewFakeGitConfig(nil)
+	if deps.common == nil {
+		deps.common = utils.NewDummyCommonWithUserConfig(deps.userConfig)
 	}
 
-	gitCommon.repo = buildRepo()
-	gitCommon.config = NewConfigCommands(gitCommon.Common, gitConfig, gitCommon.repo)
-
-	getenv := deps.getenv
-	if getenv == nil {
-		getenv = func(string) string { return "" }
+	if deps.cmd == nil {
+		deps.cmd = oscommands.NewDummyCmdObjBuilder(deps.runner)
 	}
 
-	removeFile := deps.removeFile
-	if removeFile == nil {
-		removeFile = func(string) error { return errors.New("unexpected call to removeFile") }
-	}
-
-	gitCommon.os = oscommands.NewDummyOSCommandWithDeps(oscommands.OSCommandDeps{
-		Common:       gitCommon.Common,
-		GetenvFn:     getenv,
-		Cmd:          cmd,
-		RemoveFileFn: removeFile,
-		TempDir:      os.TempDir(),
-	})
-
-	return gitCommon
+	return deps
 }
 
-func buildRepo() *gogit.Repository {
-	// TODO: think of a way to actually mock this out
+func buildConfigCommands(deps commonDeps) *ConfigCommands {
+	deps = completeDeps(deps)
+	common := utils.NewDummyCommonWithUserConfig(deps.userConfig)
+
+	// TODO: think of a way to actually mock this outnil
 	var repo *gogit.Repository = nil
-	return repo
+
+	return NewConfigCommands(common, deps.gitConfig, repo)
 }
 
-func buildFileLoader(gitCommon *GitCommon) *FileLoader {
-	return NewFileLoader(gitCommon, gitCommon.cmd, gitCommon.config)
+func buildOSCommand(deps commonDeps) *oscommands.OSCommand {
+	deps = completeDeps(deps)
+
+	return oscommands.NewDummyOSCommandWithDeps(oscommands.OSCommandDeps{
+		Common:       deps.common,
+		GetenvFn:     deps.getenv,
+		Cmd:          deps.cmd,
+		RemoveFileFn: deps.removeFile,
+	})
+}
+
+func buildFileLoader(deps commonDeps) *loaders.FileLoader {
+	deps = completeDeps(deps)
+
+	configCommands := buildConfigCommands(deps)
+
+	return loaders.NewFileLoader(deps.common, deps.cmd, configCommands)
 }
 
 func buildSubmoduleCommands(deps commonDeps) *SubmoduleCommands {
-	gitCommon := buildGitCommon(deps)
+	deps = completeDeps(deps)
 
-	return NewSubmoduleCommands(gitCommon)
+	return NewSubmoduleCommands(deps.common, deps.cmd, deps.dotGitDir)
 }
 
 func buildCommitCommands(deps commonDeps) *CommitCommands {
-	gitCommon := buildGitCommon(deps)
-	return NewCommitCommands(gitCommon)
+	deps = completeDeps(deps)
+	return NewCommitCommands(deps.common, deps.cmd)
 }
 
 func buildWorkingTreeCommands(deps commonDeps) *WorkingTreeCommands {
-	gitCommon := buildGitCommon(deps)
+	deps = completeDeps(deps)
+	osCommand := buildOSCommand(deps)
 	submoduleCommands := buildSubmoduleCommands(deps)
-	fileLoader := buildFileLoader(gitCommon)
+	fileLoader := buildFileLoader(deps)
 
-	return NewWorkingTreeCommands(gitCommon, submoduleCommands, fileLoader)
-}
-
-func buildPatchCommands(deps commonDeps) *PatchCommands { //nolint:golint,unused
-	gitCommon := buildGitCommon(deps)
-	rebaseCommands := buildRebaseCommands(deps)
-	commitCommands := buildCommitCommands(deps)
-	statusCommands := buildStatusCommands(deps)
-	stashCommands := buildStashCommands(deps)
-	loadFileFn := func(from string, to string, reverse bool, filename string, plain bool) (string, error) {
-		return "", nil
-	}
-	patchBuilder := patch.NewPatchBuilder(gitCommon.Log, loadFileFn)
-
-	return NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchBuilder)
-}
-
-func buildStatusCommands(deps commonDeps) *StatusCommands { //nolint:golint,unused
-	gitCommon := buildGitCommon(deps)
-
-	return NewStatusCommands(gitCommon)
+	return NewWorkingTreeCommands(deps.common, deps.cmd, submoduleCommands, osCommand, fileLoader)
 }
 
 func buildStashCommands(deps commonDeps) *StashCommands {
-	gitCommon := buildGitCommon(deps)
-	fileLoader := buildFileLoader(gitCommon)
+	deps = completeDeps(deps)
+	osCommand := buildOSCommand(deps)
+	fileLoader := buildFileLoader(deps)
 	workingTreeCommands := buildWorkingTreeCommands(deps)
 
-	return NewStashCommands(gitCommon, fileLoader, workingTreeCommands)
+	return NewStashCommands(deps.common, deps.cmd, osCommand, fileLoader, workingTreeCommands)
 }
 
 func buildRebaseCommands(deps commonDeps) *RebaseCommands {
-	gitCommon := buildGitCommon(deps)
+	deps = completeDeps(deps)
+	configCommands := buildConfigCommands(deps)
+	osCommand := buildOSCommand(deps)
 	workingTreeCommands := buildWorkingTreeCommands(deps)
 	commitCommands := buildCommitCommands(deps)
 
-	return NewRebaseCommands(gitCommon, commitCommands, workingTreeCommands)
+	return NewRebaseCommands(deps.common, deps.cmd, osCommand, commitCommands, workingTreeCommands, configCommands, deps.dotGitDir)
 }
 
 func buildSyncCommands(deps commonDeps) *SyncCommands {
-	gitCommon := buildGitCommon(deps)
+	deps = completeDeps(deps)
 
-	return NewSyncCommands(gitCommon)
+	return NewSyncCommands(deps.common, deps.cmd)
 }
 
 func buildFileCommands(deps commonDeps) *FileCommands {
-	gitCommon := buildGitCommon(deps)
+	deps = completeDeps(deps)
+	configCommands := buildConfigCommands(deps)
+	osCommand := buildOSCommand(deps)
 
-	return NewFileCommands(gitCommon)
-}
-
-func buildBranchCommands(deps commonDeps) *BranchCommands {
-	gitCommon := buildGitCommon(deps)
-
-	return NewBranchCommands(gitCommon)
-}
-
-func buildFlowCommands(deps commonDeps) *FlowCommands {
-	gitCommon := buildGitCommon(deps)
-
-	return NewFlowCommands(gitCommon)
+	return NewFileCommands(deps.common, deps.cmd, configCommands, osCommand)
 }

pkg/commands/git_commands/diff.go

@@ -1,106 +0,0 @@
-package git_commands
-
-import (
-	"fmt"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-)
-
-type DiffCommands struct {
-	*GitCommon
-}
-
-func NewDiffCommands(gitCommon *GitCommon) *DiffCommands {
-	return &DiffCommands{
-		GitCommon: gitCommon,
-	}
-}
-
-func (self *DiffCommands) DiffCmdObj(diffArgs []string) oscommands.ICmdObj {
-	extDiffCmd := self.UserConfig.Git.Paging.ExternalDiffCommand
-	useExtDiff := extDiffCmd != ""
-
-	return self.cmd.New(
-		NewGitCmd("diff").
-			Config("diff.noprefix=false").
-			ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
-			ArgIfElse(useExtDiff, "--ext-diff", "--no-ext-diff").
-			Arg("--submodule").
-			Arg(fmt.Sprintf("--color=%s", self.UserConfig.Git.Paging.ColorArg)).
-			Arg(diffArgs...).
-			Dir(self.repoPaths.worktreePath).
-			ToArgv(),
-	)
-}
-
-func (self *DiffCommands) internalDiffCmdObj(diffArgs ...string) *GitCommandBuilder {
-	return NewGitCmd("diff").
-		Config("diff.noprefix=false").
-		Arg("--no-ext-diff", "--no-color").
-		Arg(diffArgs...).
-		Dir(self.repoPaths.worktreePath)
-}
-
-func (self *DiffCommands) GetPathDiff(path string, staged bool) (string, error) {
-	return self.cmd.New(
-		self.internalDiffCmdObj().
-			ArgIf(staged, "--staged").
-			Arg(path).
-			ToArgv(),
-	).RunWithOutput()
-}
-
-func (self *DiffCommands) GetAllDiff(staged bool) (string, error) {
-	return self.cmd.New(
-		self.internalDiffCmdObj().
-			ArgIf(staged, "--staged").
-			ToArgv(),
-	).RunWithOutput()
-}
-
-type DiffToolCmdOptions struct {
-	// The path to show a diff for. Pass "." for the entire repo.
-	Filepath string
-
-	// The commit against which to show the diff. Leave empty to show a diff of
-	// the working copy.
-	FromCommit string
-
-	// The commit to diff against FromCommit. Leave empty to diff the working
-	// copy against FromCommit. Leave both FromCommit and ToCommit empty to show
-	// the diff of the unstaged working copy changes against the index if Staged
-	// is false, or the staged changes against HEAD if Staged is true.
-	ToCommit string
-
-	// Whether to reverse the left and right sides of the diff.
-	Reverse bool
-
-	// Whether the given Filepath is a directory. We'll pass --dir-diff to
-	// git-difftool in that case.
-	IsDirectory bool
-
-	// Whether to show the staged or the unstaged changes. Must be false if both
-	// FromCommit and ToCommit are non-empty.
-	Staged bool
-}
-
-func (self *DiffCommands) OpenDiffToolCmdObj(opts DiffToolCmdOptions) oscommands.ICmdObj {
-	return self.cmd.New(NewGitCmd("difftool").
-		Arg("--no-prompt").
-		ArgIf(opts.IsDirectory, "--dir-diff").
-		ArgIf(opts.Staged, "--cached").
-		ArgIf(opts.FromCommit != "", opts.FromCommit).
-		ArgIf(opts.ToCommit != "", opts.ToCommit).
-		ArgIf(opts.Reverse, "-R").
-		Arg("--", opts.Filepath).
-		ToArgv())
-}
-
-func (self *DiffCommands) DiffIndexCmdObj(diffArgs ...string) oscommands.ICmdObj {
-	return self.cmd.New(
-		NewGitCmd("diff-index").
-			Config("diff.noprefix=false").
-			Arg("--submodule", "--no-ext-diff", "--no-color", "--patch").
-			Arg(diffArgs...).ToArgv(),
-	)
-}

pkg/commands/git_commands/file.go

@@ -1,36 +1,51 @@
 package git_commands
 
 import (
-	"os"
+	"io/ioutil"
 	"strconv"
-	"strings"
 
 	"github.com/go-errors/errors"
-	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
 )
 
 type FileCommands struct {
-	*GitCommon
+	*common.Common
+
+	cmd    oscommands.ICmdObjBuilder
+	config *ConfigCommands
+	os     FileOSCommand
 }
 
-func NewFileCommands(gitCommon *GitCommon) *FileCommands {
+type FileOSCommand interface {
+	Getenv(string) string
+}
+
+func NewFileCommands(
+	common *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+	config *ConfigCommands,
+	osCommand FileOSCommand,
+) *FileCommands {
 	return &FileCommands{
-		GitCommon: gitCommon,
+		Common: common,
+		cmd:    cmd,
+		config: config,
+		os:     osCommand,
 	}
 }
 
 // Cat obtains the content of a file
 func (self *FileCommands) Cat(fileName string) (string, error) {
-	buf, err := os.ReadFile(fileName)
+	buf, err := ioutil.ReadFile(fileName)
 	if err != nil {
 		return "", nil
 	}
 	return string(buf), nil
 }
 
-func (self *FileCommands) GetEditCmdStrLegacy(filename string, lineNumber int) (string, error) {
+func (self *FileCommands) GetEditCmdStr(filename string, lineNumber int) (string, error) {
 	editor := self.UserConfig.OS.EditCommand
 
 	if editor == "" {
@@ -46,7 +61,7 @@ func (self *FileCommands) GetEditCmdStrLegacy(filename string, lineNumber int) (
 		editor = self.os.Getenv("EDITOR")
 	}
 	if editor == "" {
-		if err := self.cmd.New([]string{"which", "vi"}).DontLog().Run(); err == nil {
+		if err := self.cmd.New("which vi").DontLog().Run(); err == nil {
 			editor = "vi"
 		}
 	}
@@ -61,110 +76,5 @@ func (self *FileCommands) GetEditCmdStrLegacy(filename string, lineNumber int) (
 	}
 
 	editCmdTemplate := self.UserConfig.OS.EditCommandTemplate
-	if len(editCmdTemplate) == 0 {
-		switch editor {
-		case "emacs", "nano", "vi", "vim", "nvim":
-			editCmdTemplate = "{{editor}} +{{line}} -- {{filename}}"
-		case "subl":
-			editCmdTemplate = "{{editor}} -- {{filename}}:{{line}}"
-		case "code":
-			editCmdTemplate = "{{editor}} -r --goto -- {{filename}}:{{line}}"
-		default:
-			editCmdTemplate = "{{editor}} -- {{filename}}"
-		}
-	}
 	return utils.ResolvePlaceholderString(editCmdTemplate, templateValues), nil
 }
-
-func (self *FileCommands) GetEditCmdStr(filenames []string) (string, bool) {
-	// Legacy support for old config; to be removed at some point
-	if self.UserConfig.OS.Edit == "" && self.UserConfig.OS.EditCommandTemplate != "" {
-		// If multiple files are selected, we'll simply edit just the first one.
-		// It's not worth fixing this for the legacy support.
-		if cmdStr, err := self.GetEditCmdStrLegacy(filenames[0], 1); err == nil {
-			return cmdStr, true
-		}
-	}
-
-	template, suspend := config.GetEditTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
-	quotedFilenames := lo.Map(filenames, func(filename string, _ int) string { return self.cmd.Quote(filename) })
-
-	templateValues := map[string]string{
-		"filename": strings.Join(quotedFilenames, " "),
-	}
-
-	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
-	return cmdStr, suspend
-}
-
-func (self *FileCommands) GetEditAtLineCmdStr(filename string, lineNumber int) (string, bool) {
-	// Legacy support for old config; to be removed at some point
-	if self.UserConfig.OS.EditAtLine == "" && self.UserConfig.OS.EditCommandTemplate != "" {
-		if cmdStr, err := self.GetEditCmdStrLegacy(filename, lineNumber); err == nil {
-			return cmdStr, true
-		}
-	}
-
-	template, suspend := config.GetEditAtLineTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
-
-	templateValues := map[string]string{
-		"filename": self.cmd.Quote(filename),
-		"line":     strconv.Itoa(lineNumber),
-	}
-
-	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
-	return cmdStr, suspend
-}
-
-func (self *FileCommands) GetEditAtLineAndWaitCmdStr(filename string, lineNumber int) string {
-	// Legacy support for old config; to be removed at some point
-	if self.UserConfig.OS.EditAtLineAndWait == "" && self.UserConfig.OS.EditCommandTemplate != "" {
-		if cmdStr, err := self.GetEditCmdStrLegacy(filename, lineNumber); err == nil {
-			return cmdStr
-		}
-	}
-
-	template := config.GetEditAtLineAndWaitTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
-
-	templateValues := map[string]string{
-		"filename": self.cmd.Quote(filename),
-		"line":     strconv.Itoa(lineNumber),
-	}
-
-	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
-	return cmdStr
-}
-
-func (self *FileCommands) GetOpenDirInEditorCmdStr(path string) (string, bool) {
-	template, suspend := config.GetOpenDirInEditorTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
-
-	templateValues := map[string]string{
-		"dir": self.cmd.Quote(path),
-	}
-
-	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
-	return cmdStr, suspend
-}
-
-func (self *FileCommands) guessDefaultEditor() string {
-	// Try to query a few places where editors get configured
-	editor := self.config.GetCoreEditor()
-	if editor == "" {
-		editor = self.os.Getenv("GIT_EDITOR")
-	}
-	if editor == "" {
-		editor = self.os.Getenv("VISUAL")
-	}
-	if editor == "" {
-		editor = self.os.Getenv("EDITOR")
-	}
-
-	if editor != "" {
-		// At this point, it might be more than just the name of the editor;
-		// e.g. it might be "code -w" or "vim -u myvim.rc". So assume that
-		// everything up to the first space is the editor name.
-		editor = strings.Split(editor, " ")[0]
-	}
-
-	return editor
-}

pkg/commands/git_commands/file_loader.go

@@ -1,144 +0,0 @@
-package git_commands
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-)
-
-type FileLoaderConfig interface {
-	GetShowUntrackedFiles() string
-}
-
-type FileLoader struct {
-	*GitCommon
-	cmd         oscommands.ICmdObjBuilder
-	config      FileLoaderConfig
-	getFileType func(string) string
-}
-
-func NewFileLoader(gitCommon *GitCommon, cmd oscommands.ICmdObjBuilder, config FileLoaderConfig) *FileLoader {
-	return &FileLoader{
-		GitCommon:   gitCommon,
-		cmd:         cmd,
-		getFileType: oscommands.FileType,
-		config:      config,
-	}
-}
-
-type GetStatusFileOptions struct {
-	NoRenames bool
-}
-
-func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File {
-	// check if config wants us ignoring untracked files
-	untrackedFilesSetting := self.config.GetShowUntrackedFiles()
-
-	if untrackedFilesSetting == "" {
-		untrackedFilesSetting = "all"
-	}
-	untrackedFilesArg := fmt.Sprintf("--untracked-files=%s", untrackedFilesSetting)
-
-	statuses, err := self.gitStatus(GitStatusOptions{NoRenames: opts.NoRenames, UntrackedFilesArg: untrackedFilesArg})
-	if err != nil {
-		self.Log.Error(err)
-	}
-	files := []*models.File{}
-
-	for _, status := range statuses {
-		if strings.HasPrefix(status.StatusString, "warning") {
-			self.Log.Warningf("warning when calling git status: %s", status.StatusString)
-			continue
-		}
-
-		file := &models.File{
-			Name:          status.Name,
-			PreviousName:  status.PreviousName,
-			DisplayString: status.StatusString,
-		}
-
-		models.SetStatusFields(file, status.Change)
-		files = append(files, file)
-	}
-
-	// Go through the files to see if any of these files are actually worktrees
-	// so that we can render them correctly
-	worktreePaths := linkedWortkreePaths(self.Fs, self.repoPaths.RepoGitDirPath())
-	for _, file := range files {
-		for _, worktreePath := range worktreePaths {
-			absFilePath, err := filepath.Abs(file.Name)
-			if err != nil {
-				self.Log.Error(err)
-				continue
-			}
-			if absFilePath == worktreePath {
-				file.IsWorktree = true
-				// `git status` renders this worktree as a folder with a trailing slash but we'll represent it as a singular worktree
-				// If we include the slash, it will be rendered as a folder with a null file inside.
-				file.Name = strings.TrimSuffix(file.Name, "/")
-				break
-			}
-		}
-	}
-
-	return files
-}
-
-// GitStatus returns the file status of the repo
-type GitStatusOptions struct {
-	NoRenames         bool
-	UntrackedFilesArg string
-}
-
-type FileStatus struct {
-	StatusString string
-	Change       string // ??, MM, AM, ...
-	Name         string
-	PreviousName string
-}
-
-func (c *FileLoader) gitStatus(opts GitStatusOptions) ([]FileStatus, error) {
-	cmdArgs := NewGitCmd("status").
-		Arg(opts.UntrackedFilesArg).
-		Arg("--porcelain").
-		Arg("-z").
-		ArgIf(opts.NoRenames, "--no-renames").
-		ToArgv()
-
-	statusLines, _, err := c.cmd.New(cmdArgs).DontLog().RunWithOutputs()
-	if err != nil {
-		return []FileStatus{}, err
-	}
-
-	splitLines := strings.Split(statusLines, "\x00")
-	response := []FileStatus{}
-
-	for i := 0; i < len(splitLines); i++ {
-		original := splitLines[i]
-
-		if len(original) < 3 {
-			continue
-		}
-
-		status := FileStatus{
-			StatusString: original,
-			Change:       original[:2],
-			Name:         original[3:],
-			PreviousName: "",
-		}
-
-		if strings.HasPrefix(status.Change, "R") {
-			// if a line starts with 'R' then the next line is the original file.
-			status.PreviousName = splitLines[i+1]
-			status.StatusString = fmt.Sprintf("%s %s -> %s", status.Change, status.PreviousName, status.Name)
-			i++
-		}
-
-		response = append(response, status)
-	}
-
-	return response, nil
-}

pkg/commands/git_commands/file_loader_test.go

@@ -1,196 +0,0 @@
-package git_commands
-
-import (
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestFileGetStatusFiles(t *testing.T) {
-	type scenario struct {
-		testName      string
-		runner        oscommands.ICmdObjRunner
-		expectedFiles []*models.File
-	}
-
-	scenarios := []scenario{
-		{
-			"No files found",
-			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"}, "", nil),
-			[]*models.File{},
-		},
-		{
-			"Several files found",
-			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"},
-					"MM file1.txt\x00A  file3.txt\x00AM file2.txt\x00?? file4.txt\x00UU file5.txt",
-					nil,
-				),
-			[]*models.File{
-				{
-					Name:                    "file1.txt",
-					HasStagedChanges:        true,
-					HasUnstagedChanges:      true,
-					Tracked:                 true,
-					Added:                   false,
-					Deleted:                 false,
-					HasMergeConflicts:       false,
-					HasInlineMergeConflicts: false,
-					DisplayString:           "MM file1.txt",
-					ShortStatus:             "MM",
-				},
-				{
-					Name:                    "file3.txt",
-					HasStagedChanges:        true,
-					HasUnstagedChanges:      false,
-					Tracked:                 false,
-					Added:                   true,
-					Deleted:                 false,
-					HasMergeConflicts:       false,
-					HasInlineMergeConflicts: false,
-					DisplayString:           "A  file3.txt",
-					ShortStatus:             "A ",
-				},
-				{
-					Name:                    "file2.txt",
-					HasStagedChanges:        true,
-					HasUnstagedChanges:      true,
-					Tracked:                 false,
-					Added:                   true,
-					Deleted:                 false,
-					HasMergeConflicts:       false,
-					HasInlineMergeConflicts: false,
-					DisplayString:           "AM file2.txt",
-					ShortStatus:             "AM",
-				},
-				{
-					Name:                    "file4.txt",
-					HasStagedChanges:        false,
-					HasUnstagedChanges:      true,
-					Tracked:                 false,
-					Added:                   true,
-					Deleted:                 false,
-					HasMergeConflicts:       false,
-					HasInlineMergeConflicts: false,
-					DisplayString:           "?? file4.txt",
-					ShortStatus:             "??",
-				},
-				{
-					Name:                    "file5.txt",
-					HasStagedChanges:        false,
-					HasUnstagedChanges:      true,
-					Tracked:                 true,
-					Added:                   false,
-					Deleted:                 false,
-					HasMergeConflicts:       true,
-					HasInlineMergeConflicts: true,
-					DisplayString:           "UU file5.txt",
-					ShortStatus:             "UU",
-				},
-			},
-		},
-		{
-			"File with new line char",
-			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"}, "MM a\nb.txt", nil),
-			[]*models.File{
-				{
-					Name:                    "a\nb.txt",
-					HasStagedChanges:        true,
-					HasUnstagedChanges:      true,
-					Tracked:                 true,
-					Added:                   false,
-					Deleted:                 false,
-					HasMergeConflicts:       false,
-					HasInlineMergeConflicts: false,
-					DisplayString:           "MM a\nb.txt",
-					ShortStatus:             "MM",
-				},
-			},
-		},
-		{
-			"Renamed files",
-			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"},
-					"R  after1.txt\x00before1.txt\x00RM after2.txt\x00before2.txt",
-					nil,
-				),
-			[]*models.File{
-				{
-					Name:                    "after1.txt",
-					PreviousName:            "before1.txt",
-					HasStagedChanges:        true,
-					HasUnstagedChanges:      false,
-					Tracked:                 true,
-					Added:                   false,
-					Deleted:                 false,
-					HasMergeConflicts:       false,
-					HasInlineMergeConflicts: false,
-					DisplayString:           "R  before1.txt -> after1.txt",
-					ShortStatus:             "R ",
-				},
-				{
-					Name:                    "after2.txt",
-					PreviousName:            "before2.txt",
-					HasStagedChanges:        true,
-					HasUnstagedChanges:      true,
-					Tracked:                 true,
-					Added:                   false,
-					Deleted:                 false,
-					HasMergeConflicts:       false,
-					HasInlineMergeConflicts: false,
-					DisplayString:           "RM before2.txt -> after2.txt",
-					ShortStatus:             "RM",
-				},
-			},
-		},
-		{
-			"File with arrow in name",
-			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"},
-					`?? a -> b.txt`,
-					nil,
-				),
-			[]*models.File{
-				{
-					Name:                    "a -> b.txt",
-					HasStagedChanges:        false,
-					HasUnstagedChanges:      true,
-					Tracked:                 false,
-					Added:                   true,
-					Deleted:                 false,
-					HasMergeConflicts:       false,
-					HasInlineMergeConflicts: false,
-					DisplayString:           "?? a -> b.txt",
-					ShortStatus:             "??",
-				},
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			cmd := oscommands.NewDummyCmdObjBuilder(s.runner)
-
-			loader := &FileLoader{
-				GitCommon:   buildGitCommon(commonDeps{}),
-				cmd:         cmd,
-				config:      &FakeFileLoaderConfig{showUntrackedFiles: "yes"},
-				getFileType: func(string) string { return "file" },
-			}
-
-			assert.EqualValues(t, s.expectedFiles, loader.GetStatusFiles(GetStatusFileOptions{}))
-		})
-	}
-}
-
-type FakeFileLoaderConfig struct {
-	showUntrackedFiles string
-}
-
-func (self *FakeFileLoaderConfig) GetShowUntrackedFiles() string {
-	return self.showUntrackedFiles
-}

pkg/commands/git_commands/file_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestEditFileCmdStrLegacy(t *testing.T) {
+func TestEditFileCmdStr(t *testing.T) {
 	type scenario struct {
 		filename                  string
 		configEditCommand         string
@@ -27,7 +27,7 @@ func TestEditFileCmdStrLegacy(t *testing.T) {
 			configEditCommand:         "",
 			configEditCommandTemplate: "{{editor}} {{filename}}",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectArgs([]string{"which", "vi"}, "", errors.New("error")),
+				Expect(`which vi`, "", errors.New("error")),
 			getenv: func(env string) string {
 				return ""
 			},
@@ -79,7 +79,6 @@ func TestEditFileCmdStrLegacy(t *testing.T) {
 			gitConfigMockResponses: nil,
 			test: func(cmdStr string, err error) {
 				assert.NoError(t, err)
-				assert.Equal(t, `nano "test"`, cmdStr)
 			},
 		},
 		{
@@ -105,7 +104,7 @@ func TestEditFileCmdStrLegacy(t *testing.T) {
 			configEditCommand:         "",
 			configEditCommandTemplate: "{{editor}} {{filename}}",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectArgs([]string{"which", "vi"}, "/usr/bin/vi", nil),
+				Expect(`which vi`, "/usr/bin/vi", nil),
 			getenv: func(env string) string {
 				return ""
 			},
@@ -120,7 +119,7 @@ func TestEditFileCmdStrLegacy(t *testing.T) {
 			configEditCommand:         "",
 			configEditCommandTemplate: "{{editor}} {{filename}}",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectArgs([]string{"which", "vi"}, "/usr/bin/vi", nil),
+				Expect(`which vi`, "/usr/bin/vi", nil),
 			getenv: func(env string) string {
 				return ""
 			},
@@ -144,20 +143,6 @@ func TestEditFileCmdStrLegacy(t *testing.T) {
 				assert.Equal(t, `vim +1 "open file/at line"`, cmdStr)
 			},
 		},
-		{
-			filename:                  "default edit command template",
-			configEditCommand:         "vim",
-			configEditCommandTemplate: "",
-			runner:                    oscommands.NewFakeRunner(t),
-			getenv: func(env string) string {
-				return ""
-			},
-			gitConfigMockResponses: nil,
-			test: func(cmdStr string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, `vim +1 -- "default edit command template"`, cmdStr)
-			},
-		},
 	}
 
 	for _, s := range scenarios {
@@ -172,214 +157,7 @@ func TestEditFileCmdStrLegacy(t *testing.T) {
 			getenv:     s.getenv,
 		})
 
-		s.test(instance.GetEditCmdStrLegacy(s.filename, 1))
+		s.test(instance.GetEditCmdStr(s.filename, 1))
 		s.runner.CheckForMissingCalls()
 	}
 }
-
-func TestEditFilesCmd(t *testing.T) {
-	type scenario struct {
-		filenames      []string
-		osConfig       config.OSConfig
-		expectedCmdStr string
-		suspend        bool
-	}
-
-	scenarios := []scenario{
-		{
-			filenames:      []string{"test"},
-			osConfig:       config.OSConfig{},
-			expectedCmdStr: `vim -- "test"`,
-			suspend:        true,
-		},
-		{
-			filenames: []string{"test"},
-			osConfig: config.OSConfig{
-				Edit: "nano {{filename}}",
-			},
-			expectedCmdStr: `nano "test"`,
-			suspend:        true,
-		},
-		{
-			filenames: []string{"file/with space"},
-			osConfig: config.OSConfig{
-				EditPreset: "sublime",
-			},
-			expectedCmdStr: `subl -- "file/with space"`,
-			suspend:        false,
-		},
-		{
-			filenames: []string{"multiple", "files"},
-			osConfig: config.OSConfig{
-				EditPreset: "sublime",
-			},
-			expectedCmdStr: `subl -- "multiple" "files"`,
-			suspend:        false,
-		},
-	}
-
-	for _, s := range scenarios {
-		userConfig := config.GetDefaultConfig()
-		userConfig.OS = s.osConfig
-
-		instance := buildFileCommands(commonDeps{
-			userConfig: userConfig,
-		})
-
-		cmdStr, suspend := instance.GetEditCmdStr(s.filenames)
-		assert.Equal(t, s.expectedCmdStr, cmdStr)
-		assert.Equal(t, s.suspend, suspend)
-	}
-}
-
-func TestEditFileAtLineCmd(t *testing.T) {
-	type scenario struct {
-		filename       string
-		lineNumber     int
-		osConfig       config.OSConfig
-		expectedCmdStr string
-		suspend        bool
-	}
-
-	scenarios := []scenario{
-		{
-			filename:       "test",
-			lineNumber:     42,
-			osConfig:       config.OSConfig{},
-			expectedCmdStr: `vim +42 -- "test"`,
-			suspend:        true,
-		},
-		{
-			filename:   "test",
-			lineNumber: 35,
-			osConfig: config.OSConfig{
-				EditAtLine: "nano +{{line}} {{filename}}",
-			},
-			expectedCmdStr: `nano +35 "test"`,
-			suspend:        true,
-		},
-		{
-			filename:   "file/with space",
-			lineNumber: 12,
-			osConfig: config.OSConfig{
-				EditPreset: "sublime",
-			},
-			expectedCmdStr: `subl -- "file/with space":12`,
-			suspend:        false,
-		},
-	}
-
-	for _, s := range scenarios {
-		userConfig := config.GetDefaultConfig()
-		userConfig.OS = s.osConfig
-
-		instance := buildFileCommands(commonDeps{
-			userConfig: userConfig,
-		})
-
-		cmdStr, suspend := instance.GetEditAtLineCmdStr(s.filename, s.lineNumber)
-		assert.Equal(t, s.expectedCmdStr, cmdStr)
-		assert.Equal(t, s.suspend, suspend)
-	}
-}
-
-func TestEditFileAtLineAndWaitCmd(t *testing.T) {
-	type scenario struct {
-		filename       string
-		lineNumber     int
-		osConfig       config.OSConfig
-		expectedCmdStr string
-	}
-
-	scenarios := []scenario{
-		{
-			filename:       "test",
-			lineNumber:     42,
-			osConfig:       config.OSConfig{},
-			expectedCmdStr: `vim +42 -- "test"`,
-		},
-		{
-			filename:   "file/with space",
-			lineNumber: 12,
-			osConfig: config.OSConfig{
-				EditPreset: "sublime",
-			},
-			expectedCmdStr: `subl --wait -- "file/with space":12`,
-		},
-	}
-
-	for _, s := range scenarios {
-		userConfig := config.GetDefaultConfig()
-		userConfig.OS = s.osConfig
-
-		instance := buildFileCommands(commonDeps{
-			userConfig: userConfig,
-		})
-
-		cmdStr := instance.GetEditAtLineAndWaitCmdStr(s.filename, s.lineNumber)
-		assert.Equal(t, s.expectedCmdStr, cmdStr)
-	}
-}
-
-func TestGuessDefaultEditor(t *testing.T) {
-	type scenario struct {
-		gitConfigMockResponses map[string]string
-		getenv                 func(string) string
-		expectedResult         string
-	}
-
-	scenarios := []scenario{
-		{
-			gitConfigMockResponses: nil,
-			getenv: func(env string) string {
-				return ""
-			},
-			expectedResult: "",
-		},
-		{
-			gitConfigMockResponses: map[string]string{"core.editor": "nano"},
-			getenv: func(env string) string {
-				return ""
-			},
-			expectedResult: "nano",
-		},
-		{
-			gitConfigMockResponses: map[string]string{"core.editor": "code -w"},
-			getenv: func(env string) string {
-				return ""
-			},
-			expectedResult: "code",
-		},
-		{
-			gitConfigMockResponses: nil,
-			getenv: func(env string) string {
-				if env == "VISUAL" {
-					return "emacs"
-				}
-
-				return ""
-			},
-			expectedResult: "emacs",
-		},
-		{
-			gitConfigMockResponses: nil,
-			getenv: func(env string) string {
-				if env == "EDITOR" {
-					return "bbedit -w"
-				}
-
-				return ""
-			},
-			expectedResult: "bbedit",
-		},
-	}
-
-	for _, s := range scenarios {
-		instance := buildFileCommands(commonDeps{
-			gitConfig: git_config.NewFakeGitConfig(s.gitConfigMockResponses),
-			getenv:    s.getenv,
-		})
-
-		assert.Equal(t, s.expectedResult, instance.guessDefaultEditor())
-	}
-}

pkg/commands/git_commands/flow.go

@@ -6,17 +6,25 @@ import (
 
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
 )
 
 type FlowCommands struct {
-	*GitCommon
+	*common.Common
+
+	config *ConfigCommands
+	cmd    oscommands.ICmdObjBuilder
 }
 
 func NewFlowCommands(
-	gitCommon *GitCommon,
+	common *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+	config *ConfigCommands,
 ) *FlowCommands {
 	return &FlowCommands{
-		GitCommon: gitCommon,
+		Common: common,
+		cmd:    cmd,
+		config: config,
 	}
 }
 
@@ -34,7 +42,6 @@ func (self *FlowCommands) FinishCmdObj(branchName string) (oscommands.ICmdObj, e
 	branchType := ""
 	for _, line := range strings.Split(strings.TrimSpace(prefixes), "\n") {
 		if strings.HasPrefix(line, "gitflow.prefix.") && strings.HasSuffix(line, prefix) {
-
 			regex := regexp.MustCompile("gitflow.prefix.([^ ]*) .*")
 			matches := regex.FindAllStringSubmatch(line, 1)
 
@@ -49,13 +56,9 @@ func (self *FlowCommands) FinishCmdObj(branchName string) (oscommands.ICmdObj, e
 		return nil, errors.New(self.Tr.NotAGitFlowBranch)
 	}
 
-	cmdArgs := NewGitCmd("flow").Arg(branchType, "finish", suffix).ToArgv()
-
-	return self.cmd.New(cmdArgs), nil
+	return self.cmd.New("git flow " + branchType + " finish " + suffix), nil
 }
 
 func (self *FlowCommands) StartCmdObj(branchType string, name string) oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("flow").Arg(branchType, "start", name).ToArgv()
-
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New("git flow " + branchType + " start " + name)
 }

pkg/commands/git_commands/flow_test.go

@@ -1,90 +0,0 @@
-package git_commands
-
-import (
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestStartCmdObj(t *testing.T) {
-	scenarios := []struct {
-		testName   string
-		branchType string
-		name       string
-		expected   []string
-	}{
-		{
-			testName:   "basic",
-			branchType: "feature",
-			name:       "test",
-			expected:   []string{"git", "flow", "feature", "start", "test"},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			instance := buildFlowCommands(commonDeps{})
-
-			assert.Equal(t,
-				instance.StartCmdObj(s.branchType, s.name).Args(),
-				s.expected,
-			)
-		})
-	}
-}
-
-func TestFinishCmdObj(t *testing.T) {
-	scenarios := []struct {
-		testName               string
-		branchName             string
-		expected               []string
-		expectedError          string
-		gitConfigMockResponses map[string]string
-	}{
-		{
-			testName:               "not a git flow branch",
-			branchName:             "mybranch",
-			expected:               nil,
-			expectedError:          "This does not seem to be a git flow branch",
-			gitConfigMockResponses: nil,
-		},
-		{
-			testName:               "feature branch without config",
-			branchName:             "feature/mybranch",
-			expected:               nil,
-			expectedError:          "This does not seem to be a git flow branch",
-			gitConfigMockResponses: nil,
-		},
-		{
-			testName:      "feature branch with config",
-			branchName:    "feature/mybranch",
-			expected:      []string{"git", "flow", "feature", "finish", "mybranch"},
-			expectedError: "",
-			gitConfigMockResponses: map[string]string{
-				"--local --get-regexp gitflow.prefix": "gitflow.prefix.feature feature/",
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			instance := buildFlowCommands(commonDeps{
-				gitConfig: git_config.NewFakeGitConfig(s.gitConfigMockResponses),
-			})
-
-			cmd, err := instance.FinishCmdObj(s.branchName)
-
-			if s.expectedError != "" {
-				if err == nil {
-					t.Errorf("Expected error, got nil")
-				} else {
-					assert.Equal(t, err.Error(), s.expectedError)
-				}
-			} else {
-				assert.NoError(t, err)
-				assert.Equal(t, cmd.Args(), s.expected)
-			}
-		})
-	}
-}

pkg/commands/git_commands/git_command_builder.go

@@ -1,101 +0,0 @@
-package git_commands
-
-import (
-	"strings"
-)
-
-// convenience struct for building git commands. Especially useful when
-// including conditional args
-type GitCommandBuilder struct {
-	// command string
-	args []string
-}
-
-func NewGitCmd(command string) *GitCommandBuilder {
-	return &GitCommandBuilder{args: []string{command}}
-}
-
-func (self *GitCommandBuilder) Arg(args ...string) *GitCommandBuilder {
-	self.args = append(self.args, args...)
-
-	return self
-}
-
-func (self *GitCommandBuilder) ArgIf(condition bool, ifTrue ...string) *GitCommandBuilder {
-	if condition {
-		self.Arg(ifTrue...)
-	}
-
-	return self
-}
-
-func (self *GitCommandBuilder) ArgIfElse(condition bool, ifTrue string, ifFalse string) *GitCommandBuilder {
-	if condition {
-		return self.Arg(ifTrue)
-	} else {
-		return self.Arg(ifFalse)
-	}
-}
-
-func (self *GitCommandBuilder) Config(value string) *GitCommandBuilder {
-	// config settings come before the command
-	self.args = append([]string{"-c", value}, self.args...)
-
-	return self
-}
-
-func (self *GitCommandBuilder) ConfigIf(condition bool, ifTrue string) *GitCommandBuilder {
-	if condition {
-		self.Config(ifTrue)
-	}
-
-	return self
-}
-
-// the -C arg will make git do a `cd` to the directory before doing anything else
-func (self *GitCommandBuilder) Dir(path string) *GitCommandBuilder {
-	// repo path comes before the command
-	self.args = append([]string{"-C", path}, self.args...)
-
-	return self
-}
-
-func (self *GitCommandBuilder) DirIf(condition bool, path string) *GitCommandBuilder {
-	if condition {
-		return self.Dir(path)
-	}
-
-	return self
-}
-
-// Note, you may prefer to use the Dir method instead of this one
-func (self *GitCommandBuilder) Worktree(path string) *GitCommandBuilder {
-	// worktree arg comes before the command
-	self.args = append([]string{"--work-tree", path}, self.args...)
-
-	return self
-}
-
-// Note, you may prefer to use the Dir method instead of this one
-func (self *GitCommandBuilder) GitDir(path string) *GitCommandBuilder {
-	// git dir arg comes before the command
-	self.args = append([]string{"--git-dir", path}, self.args...)
-
-	return self
-}
-
-func (self *GitCommandBuilder) GitDirIf(condition bool, path string) *GitCommandBuilder {
-	if condition {
-		return self.GitDir(path)
-	}
-
-	return self
-}
-
-func (self *GitCommandBuilder) ToArgv() []string {
-	return append([]string{"git"}, self.args...)
-}
-
-func (self *GitCommandBuilder) ToString() string {
-	return strings.Join(self.ToArgv(), " ")
-}

pkg/commands/git_commands/git_command_builder_test.go

@@ -1,56 +0,0 @@
-package git_commands
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGitCommandBuilder(t *testing.T) {
-	scenarios := []struct {
-		input    []string
-		expected []string
-	}{
-		{
-			input: NewGitCmd("push").
-				Arg("--force-with-lease").
-				Arg("--set-upstream").
-				Arg("origin").
-				Arg("master").
-				ToArgv(),
-			expected: []string{"git", "push", "--force-with-lease", "--set-upstream", "origin", "master"},
-		},
-		{
-			input:    NewGitCmd("push").ArgIf(true, "--test").ToArgv(),
-			expected: []string{"git", "push", "--test"},
-		},
-		{
-			input:    NewGitCmd("push").ArgIf(false, "--test").ToArgv(),
-			expected: []string{"git", "push"},
-		},
-		{
-			input:    NewGitCmd("push").ArgIfElse(true, "-b", "-a").ToArgv(),
-			expected: []string{"git", "push", "-b"},
-		},
-		{
-			input:    NewGitCmd("push").ArgIfElse(false, "-a", "-b").ToArgv(),
-			expected: []string{"git", "push", "-b"},
-		},
-		{
-			input:    NewGitCmd("push").Arg("-a", "-b").ToArgv(),
-			expected: []string{"git", "push", "-a", "-b"},
-		},
-		{
-			input:    NewGitCmd("push").Config("user.name=foo").Config("user.email=bar").ToArgv(),
-			expected: []string{"git", "-c", "user.email=bar", "-c", "user.name=foo", "push"},
-		},
-		{
-			input:    NewGitCmd("push").Dir("a/b/c").ToArgv(),
-			expected: []string{"git", "-C", "a/b/c", "push"},
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.Equal(t, s.input, s.expected)
-	}
-}

pkg/commands/git_commands/main_branches.go

@@ -1,122 +0,0 @@
-package git_commands
-
-import (
-	"strings"
-	"sync"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
-	"github.com/sasha-s/go-deadlock"
-)
-
-type MainBranches struct {
-	// List of main branches configured by the user. Just the bare names.
-	configuredMainBranches []string
-	// Which of these actually exist in the repository. Full ref names, and it
-	// could be either "refs/heads/..." or "refs/remotes/origin/..." depending
-	// on which one exists for a given bare name.
-	existingMainBranches []string
-
-	cmd   oscommands.ICmdObjBuilder
-	mutex *deadlock.Mutex
-}
-
-func NewMainBranches(
-	configuredMainBranches []string,
-	cmd oscommands.ICmdObjBuilder,
-) *MainBranches {
-	return &MainBranches{
-		configuredMainBranches: configuredMainBranches,
-		existingMainBranches:   nil,
-		cmd:                    cmd,
-		mutex:                  &deadlock.Mutex{},
-	}
-}
-
-// Get the list of main branches that exist in the repository. This is a list of
-// full ref names.
-func (self *MainBranches) Get() []string {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-
-	if self.existingMainBranches == nil {
-		self.existingMainBranches = self.determineMainBranches()
-	}
-
-	return self.existingMainBranches
-}
-
-// Return the merge base of the given refName with the closest main branch.
-func (self *MainBranches) GetMergeBase(refName string) string {
-	mainBranches := self.Get()
-	if len(mainBranches) == 0 {
-		return ""
-	}
-
-	// We pass all existing main branches to the merge-base call; git will
-	// return the base commit for the closest one.
-
-	// We ignore errors from this call, since we can't distinguish whether the
-	// error is because one of the main branches has been deleted since the last
-	// call to determineMainBranches, or because the refName has no common
-	// history with any of the main branches. Since the former should happen
-	// very rarely, users must quit and restart lazygit to fix it; the latter is
-	// also not very common, but can totally happen and is not an error.
-
-	output, _ := self.cmd.New(
-		NewGitCmd("merge-base").Arg(refName).Arg(mainBranches...).
-			ToArgv(),
-	).DontLog().RunWithOutput()
-	return ignoringWarnings(output)
-}
-
-func (self *MainBranches) determineMainBranches() []string {
-	var existingBranches []string
-	var wg sync.WaitGroup
-
-	existingBranches = make([]string, len(self.configuredMainBranches))
-
-	for i, branchName := range self.configuredMainBranches {
-		wg.Add(1)
-		go utils.Safe(func() {
-			defer wg.Done()
-
-			// Try to determine upstream of local main branch
-			if ref, err := self.cmd.New(
-				NewGitCmd("rev-parse").Arg("--symbolic-full-name", branchName+"@{u}").ToArgv(),
-			).DontLog().RunWithOutput(); err == nil {
-				existingBranches[i] = strings.TrimSpace(ref)
-				return
-			}
-
-			// If this failed, a local branch for this main branch doesn't exist or it
-			// has no upstream configured. Try looking for one in the "origin" remote.
-			ref := "refs/remotes/origin/" + branchName
-			if err := self.cmd.New(
-				NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
-			).DontLog().Run(); err == nil {
-				existingBranches[i] = ref
-				return
-			}
-
-			// If this failed as well, try if we have the main branch as a local
-			// branch. This covers the case where somebody is using git locally
-			// for something, but never pushing anywhere.
-			ref = "refs/heads/" + branchName
-			if err := self.cmd.New(
-				NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
-			).DontLog().Run(); err == nil {
-				existingBranches[i] = ref
-			}
-		})
-	}
-
-	wg.Wait()
-
-	existingBranches = lo.Filter(existingBranches, func(branch string, _ int) bool {
-		return branch != ""
-	})
-
-	return existingBranches
-}

pkg/commands/git_commands/patch.go

@@ -1,101 +1,59 @@
 package git_commands
 
 import (
-	"path/filepath"
-	"time"
+	"fmt"
 
 	"github.com/go-errors/errors"
-	"github.com/jesseduffield/lazygit/pkg/app/daemon"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
 	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
-	"github.com/stefanhaller/git-todo-parser/todo"
+	"github.com/jesseduffield/lazygit/pkg/common"
 )
 
 type PatchCommands struct {
-	*GitCommon
-	rebase *RebaseCommands
-	commit *CommitCommands
-	status *StatusCommands
-	stash  *StashCommands
+	*common.Common
 
-	PatchBuilder *patch.PatchBuilder
+	cmd          oscommands.ICmdObjBuilder
+	rebase       *RebaseCommands
+	commit       *CommitCommands
+	config       *ConfigCommands
+	stash        *StashCommands
+	status       *StatusCommands
+	PatchManager *patch.PatchManager
 }
 
 func NewPatchCommands(
-	gitCommon *GitCommon,
-	rebase *RebaseCommands,
-	commit *CommitCommands,
-	status *StatusCommands,
-	stash *StashCommands,
-	patchBuilder *patch.PatchBuilder,
+	common *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+	rebaseCommands *RebaseCommands,
+	commitCommands *CommitCommands,
+	configCommands *ConfigCommands,
+	statusCommands *StatusCommands,
+	patchManager *patch.PatchManager,
 ) *PatchCommands {
 	return &PatchCommands{
-		GitCommon:    gitCommon,
-		rebase:       rebase,
-		commit:       commit,
-		status:       status,
-		stash:        stash,
-		PatchBuilder: patchBuilder,
+		Common:       common,
+		cmd:          cmd,
+		rebase:       rebaseCommands,
+		commit:       commitCommands,
+		config:       configCommands,
+		status:       statusCommands,
+		PatchManager: patchManager,
 	}
 }
 
-type ApplyPatchOpts struct {
-	ThreeWay bool
-	Cached   bool
-	Index    bool
-	Reverse  bool
-}
-
-func (self *PatchCommands) ApplyCustomPatch(reverse bool) error {
-	patch := self.PatchBuilder.PatchToApply(reverse)
-
-	return self.ApplyPatch(patch, ApplyPatchOpts{
-		Index:    true,
-		ThreeWay: true,
-		Reverse:  reverse,
-	})
-}
-
-func (self *PatchCommands) ApplyPatch(patch string, opts ApplyPatchOpts) error {
-	filepath, err := self.SaveTemporaryPatch(patch)
-	if err != nil {
-		return err
-	}
-
-	return self.applyPatchFile(filepath, opts)
-}
-
-func (self *PatchCommands) applyPatchFile(filepath string, opts ApplyPatchOpts) error {
-	cmdArgs := NewGitCmd("apply").
-		ArgIf(opts.ThreeWay, "--3way").
-		ArgIf(opts.Cached, "--cached").
-		ArgIf(opts.Index, "--index").
-		ArgIf(opts.Reverse, "--reverse").
-		Arg(filepath).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-func (self *PatchCommands) SaveTemporaryPatch(patch string) (string, error) {
-	filepath := filepath.Join(self.os.GetTempDir(), self.repoPaths.RepoName(), time.Now().Format("Jan _2 15.04.05.000000000")+".patch")
-	self.Log.Infof("saving temporary patch to %s", filepath)
-	if err := self.os.CreateFileWithContent(filepath, patch); err != nil {
-		return "", err
-	}
-	return filepath, nil
-}
-
 // DeletePatchesFromCommit applies a patch in reverse for a commit
 func (self *PatchCommands) DeletePatchesFromCommit(commits []*models.Commit, commitIndex int) error {
-	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIndex, false); err != nil {
+	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIndex); err != nil {
 		return err
 	}
 
 	// apply each patch in reverse
-	if err := self.ApplyCustomPatch(true); err != nil {
-		_ = self.rebase.AbortRebase()
+	if err := self.PatchManager.ApplyPatches(true); err != nil {
+		if err := self.rebase.AbortRebase(); err != nil {
+			return err
+		}
 		return err
 	}
 
@@ -105,7 +63,7 @@ func (self *PatchCommands) DeletePatchesFromCommit(commits []*models.Commit, com
 	}
 
 	self.rebase.onSuccessfulContinue = func() error {
-		self.PatchBuilder.Reset()
+		self.PatchManager.Reset()
 		return nil
 	}
 
@@ -115,17 +73,15 @@ func (self *PatchCommands) DeletePatchesFromCommit(commits []*models.Commit, com
 
 func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, sourceCommitIdx int, destinationCommitIdx int) error {
 	if sourceCommitIdx < destinationCommitIdx {
-		// Passing true for keepCommitsThatBecomeEmpty: if the moved-from
-		// commit becomes empty, we want to keep it, mainly for consistency with
-		// moving the patch to a *later* commit, which behaves the same.
-		if err := self.rebase.BeginInteractiveRebaseForCommit(commits, destinationCommitIdx, true); err != nil {
+		if err := self.rebase.BeginInteractiveRebaseForCommit(commits, destinationCommitIdx); err != nil {
 			return err
 		}
 
 		// apply each patch forward
-		if err := self.ApplyCustomPatch(false); err != nil {
-			// Don't abort the rebase here; this might cause conflicts, so give
-			// the user a chance to resolve them
+		if err := self.PatchManager.ApplyPatches(false); err != nil {
+			if err := self.rebase.AbortRebase(); err != nil {
+				return err
+			}
 			return err
 		}
 
@@ -135,7 +91,7 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
 		}
 
 		self.rebase.onSuccessfulContinue = func() error {
-			self.PatchBuilder.Reset()
+			self.PatchManager.Reset()
 			return nil
 		}
 
@@ -155,25 +111,25 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
 	}
 
 	baseIndex := sourceCommitIdx + 1
-
-	changes := []daemon.ChangeTodoAction{
-		{Hash: commits[sourceCommitIdx].Hash, NewAction: todo.Edit},
-		{Hash: commits[destinationCommitIdx].Hash, NewAction: todo.Edit},
+	todo := ""
+	for i, commit := range commits[0:baseIndex] {
+		a := "pick"
+		if i == sourceCommitIdx || i == destinationCommitIdx {
+			a = "edit"
+		}
+		todo = a + " " + commit.Sha + " " + commit.Name + "\n" + todo
 	}
-	self.os.LogCommand(logTodoChanges(changes), false)
 
-	err := self.rebase.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
-		baseHashOrRoot: commits[baseIndex].Hash,
-		overrideEditor: true,
-		instruction:    daemon.NewChangeTodoActionsInstruction(changes),
-	}).Run()
+	err := self.rebase.PrepareInteractiveRebaseCommand(commits[baseIndex].Sha, todo, true).Run()
 	if err != nil {
 		return err
 	}
 
 	// apply each patch in reverse
-	if err := self.ApplyCustomPatch(true); err != nil {
-		_ = self.rebase.AbortRebase()
+	if err := self.PatchManager.ApplyPatches(true); err != nil {
+		if err := self.rebase.AbortRebase(); err != nil {
+			return err
+		}
 		return err
 	}
 
@@ -182,12 +138,6 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
 		return err
 	}
 
-	patch, err := self.diffHeadAgainstCommit(commits[sourceCommitIdx])
-	if err != nil {
-		_ = self.rebase.AbortRebase()
-		return err
-	}
-
 	if self.rebase.onSuccessfulContinue != nil {
 		return errors.New("You are midway through another rebase operation. Please abort to start again")
 	}
@@ -195,9 +145,10 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
 	self.rebase.onSuccessfulContinue = func() error {
 		// now we should be up to the destination, so let's apply forward these patches to that.
 		// ideally we would ensure we're on the right commit but I'm not sure if that check is necessary
-		if err := self.ApplyPatch(patch, ApplyPatchOpts{Index: true, ThreeWay: true}); err != nil {
-			// Don't abort the rebase here; this might cause conflicts, so give
-			// the user a chance to resolve them
+		if err := self.PatchManager.ApplyPatches(false); err != nil {
+			if err := self.rebase.AbortRebase(); err != nil {
+				return err
+			}
 			return err
 		}
 
@@ -207,7 +158,7 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
 		}
 
 		self.rebase.onSuccessfulContinue = func() error {
-			self.PatchBuilder.Reset()
+			self.PatchManager.Reset()
 			return nil
 		}
 
@@ -219,18 +170,20 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
 
 func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitIdx int, stash bool) error {
 	if stash {
-		if err := self.stash.Push(self.Tr.StashPrefix + commits[commitIdx].Hash); err != nil {
+		if err := self.stash.Save(self.Tr.StashPrefix + commits[commitIdx].Sha); err != nil {
 			return err
 		}
 	}
 
-	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx, false); err != nil {
+	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx); err != nil {
 		return err
 	}
 
-	if err := self.ApplyCustomPatch(true); err != nil {
+	if err := self.PatchManager.ApplyPatches(true); err != nil {
 		if self.status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
-			_ = self.rebase.AbortRebase()
+			if err := self.rebase.AbortRebase(); err != nil {
+				return err
+			}
 		}
 		return err
 	}
@@ -240,21 +193,17 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
 		return err
 	}
 
-	patch, err := self.diffHeadAgainstCommit(commits[commitIdx])
-	if err != nil {
-		_ = self.rebase.AbortRebase()
-		return err
-	}
-
 	if self.rebase.onSuccessfulContinue != nil {
 		return errors.New("You are midway through another rebase operation. Please abort to start again")
 	}
 
 	self.rebase.onSuccessfulContinue = func() error {
 		// add patches to index
-		if err := self.ApplyPatch(patch, ApplyPatchOpts{Index: true, ThreeWay: true}); err != nil {
+		if err := self.PatchManager.ApplyPatches(false); err != nil {
 			if self.status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
-				_ = self.rebase.AbortRebase()
+				if err := self.rebase.AbortRebase(); err != nil {
+					return err
+				}
 			}
 			return err
 		}
@@ -265,25 +214,22 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
 			}
 		}
 
-		self.PatchBuilder.Reset()
+		self.PatchManager.Reset()
 		return nil
 	}
 
 	return self.rebase.ContinueRebase()
 }
 
-func (self *PatchCommands) PullPatchIntoNewCommit(
-	commits []*models.Commit,
-	commitIdx int,
-	commitSummary string,
-	commitDescription string,
-) error {
-	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx, false); err != nil {
+func (self *PatchCommands) PullPatchIntoNewCommit(commits []*models.Commit, commitIdx int) error {
+	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx); err != nil {
 		return err
 	}
 
-	if err := self.ApplyCustomPatch(true); err != nil {
-		_ = self.rebase.AbortRebase()
+	if err := self.PatchManager.ApplyPatches(true); err != nil {
+		if err := self.rebase.AbortRebase(); err != nil {
+			return err
+		}
 		return err
 	}
 
@@ -292,18 +238,18 @@ func (self *PatchCommands) PullPatchIntoNewCommit(
 		return err
 	}
 
-	patch, err := self.diffHeadAgainstCommit(commits[commitIdx])
+	// add patches to index
+	if err := self.PatchManager.ApplyPatches(false); err != nil {
+		if err := self.rebase.AbortRebase(); err != nil {
+			return err
+		}
+		return err
+	}
+
+	head_message, _ := self.commit.GetHeadCommitMessage()
+	new_message := fmt.Sprintf("Split from \"%s\"", head_message)
+	err := self.commit.CommitCmdObj(new_message).Run()
 	if err != nil {
-		_ = self.rebase.AbortRebase()
-		return err
-	}
-
-	if err := self.ApplyPatch(patch, ApplyPatchOpts{Index: true, ThreeWay: true}); err != nil {
-		_ = self.rebase.AbortRebase()
-		return err
-	}
-
-	if err := self.commit.CommitCmdObj(commitSummary, commitDescription).Run(); err != nil {
 		return err
 	}
 
@@ -311,21 +257,6 @@ func (self *PatchCommands) PullPatchIntoNewCommit(
 		return errors.New("You are midway through another rebase operation. Please abort to start again")
 	}
 
-	self.PatchBuilder.Reset()
+	self.PatchManager.Reset()
 	return self.rebase.ContinueRebase()
 }
-
-// We have just applied a patch in reverse to discard it from a commit; if we
-// now try to apply the patch again to move it to a later commit, or to the
-// index, then this would conflict "with itself" in case the patch contained
-// only some lines of a range of adjacent added lines. To solve this, we
-// get the diff of HEAD and the original commit and then apply that.
-func (self *PatchCommands) diffHeadAgainstCommit(commit *models.Commit) (string, error) {
-	cmdArgs := NewGitCmd("diff").
-		Config("diff.noprefix=false").
-		Arg("--no-ext-diff").
-		Arg("HEAD.." + commit.Hash).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).RunWithOutput()
-}